diff options
| author | Siri Hansen <[email protected]> | 2011-10-28 11:09:49 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-10-28 11:09:49 +0200 |
| commit | 3e294fdb901018a0f3926a11ffe20a19b9494d79 (patch) | |
| tree | c49c72fc9896517cfa100abf640e748ef48c4348 /lib/observer/src | |
| parent | 47bcd7451eb4a0b65bbd3a76852e6f2a5af10ce4 (diff) | |
| parent | ecdf8f06ccd9506084676e496222e0697730728d (diff) | |
| download | otp-3e294fdb901018a0f3926a11ffe20a19b9494d79.tar.gz otp-3e294fdb901018a0f3926a11ffe20a19b9494d79.tar.bz2 otp-3e294fdb901018a0f3926a11ffe20a19b9494d79.zip | |
Merge branch 'siri/observer/ttb-test-cleanup-slave-nodes/OTP-9644'
* siri/observer/ttb-test-cleanup-slave-nodes/OTP-9644:
Adjust ttb_SUITE to work better on windows
Cleanup after testcases in ttb_SUITE
Diffstat (limited to 'lib/observer/src')
| -rw-r--r-- | lib/observer/src/ttb.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/observer/src/ttb.erl b/lib/observer/src/ttb.erl index d2d9010c0f..1471be92e5 100644 --- a/lib/observer/src/ttb.erl +++ b/lib/observer/src/ttb.erl @@ -519,7 +519,7 @@ ensure_no_overloaded_nodes() -> []; _ -> ?MODULE ! {get_overloaded, self()}, - receive O -> O end + receive {overloaded,O} -> O end end, case Overloaded of [] -> ok; @@ -720,7 +720,7 @@ loop(NodeInfo, SessionInfo) -> lists:keydelete(overloaded, 1, SessionInfo)}, loop(NodeInfo, [{overloaded, [Node|Overloaded]} | SI]); {get_overloaded, Pid} -> - Pid ! proplists:get_value(overloaded, SessionInfo, []), + Pid ! {overloaded,proplists:get_value(overloaded, SessionInfo, [])}, loop(NodeInfo, SessionInfo); trace_started -> case proplists:get_value(timer, SessionInfo) of |