aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Dorobisz <[email protected]>2011-03-09 13:41:11 +0100
committerHenrik Nord <[email protected]>2011-08-30 15:22:18 +0200
commite0d7dd6fa8cbd49a08d9fa90c550b13c21c2dd23 (patch)
tree72dbb622dd739ed773a34e3d10952ebb13ec67b3
parent97fd7481fa5f6ba04b86e0251750a6f9386ca964 (diff)
downloadotp-e0d7dd6fa8cbd49a08d9fa90c550b13c21c2dd23.tar.gz
otp-e0d7dd6fa8cbd49a08d9fa90c550b13c21c2dd23.tar.bz2
otp-e0d7dd6fa8cbd49a08d9fa90c550b13c21c2dd23.zip
BUGFIX Occasional deadlock on ttb:stop
-rw-r--r--lib/observer/src/ttb.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/observer/src/ttb.erl b/lib/observer/src/ttb.erl
index 0491f3c202..1bc244a0d2 100644
--- a/lib/observer/src/ttb.erl
+++ b/lib/observer/src/ttb.erl
@@ -569,6 +569,8 @@ ensure_fetch_dir(Dir) ->
stop_return(R,Opts) ->
case {lists:member(return,Opts),R} of
{true,_} ->
+ %%Printout moved out of the ttb loop to avoid occasional deadlock
+ io:format("Stored logs in ~s~n",[element(2, R)]),
R;
{false,{stopped,_}} ->
stopped;
@@ -684,7 +686,6 @@ loop(NodeInfo, SessionInfo) ->
ets:delete(?history_table),
wait_for_fetch(AllNodes),
Absname = filename:absname(Dir),
- io:format("Stored logs in ~s~n",[Absname]),
case FetchOrFormat of
format -> format(Dir);
fetch -> ok