aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2014-10-08 01:05:44 +0200
committerPeter Andersson <[email protected]>2014-10-08 01:05:44 +0200
commite34a36c29118f86764cf3769c9ae8347c6a7d793 (patch)
tree0d5bfb9e7e3ae120311c11c9a8cc25871f0d4dbc
parenta675467f2bba5c4e7fe643a46d3a48a3cf0b020a (diff)
downloadotp-e34a36c29118f86764cf3769c9ae8347c6a7d793.tar.gz
otp-e34a36c29118f86764cf3769c9ae8347c6a7d793.tar.bz2
otp-e34a36c29118f86764cf3769c9ae8347c6a7d793.zip
Don't generate weird exit if ct_logs has terminated before shut down
-rw-r--r--lib/common_test/src/ct_logs.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 43eabb18d5..ca958ce854 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -129,7 +129,13 @@ datestr_from_dirname([]) ->
close(Info, StartDir) ->
%% close executes on the ct_util process, not on the logger process
%% so we need to use a local copy of the log cache data
- LogCacheBin = make_last_run_index(),
+ LogCacheBin =
+ case make_last_run_index() of
+ {error,_} -> % log server not responding
+ undefined;
+ LCB ->
+ LCB
+ end,
put(ct_log_cache,LogCacheBin),
Cache2File = fun() ->
case get(ct_log_cache) of