diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-12-20 12:44:15 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-12-20 12:44:15 +0000 |
| commit | 3d3f7c6de807e2770460d8369482f6dabf5148f8 (patch) | |
| tree | 8613ca7f17b76f40cf560127741d7791ce2ec277 | |
| parent | d8ae7115f1fa24c84abca27a4719039eb18ef524 (diff) | |
| download | rabbitmq-server-git-3d3f7c6de807e2770460d8369482f6dabf5148f8.tar.gz | |
treat nodedown as a recoverable error
| -rw-r--r-- | src/delegate.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/delegate.erl b/src/delegate.erl index 3814edcf8e..10054e57b6 100644 --- a/src/delegate.erl +++ b/src/delegate.erl @@ -87,7 +87,7 @@ invoke(Pids, Fun) when is_list(Pids) -> {invoke, Fun, Grouped}, infinity) end, - BadPids = [{Pid, {exit, badnode, []}} || + BadPids = [{Pid, {exit, {nodedown, BadNode}, []}} || BadNode <- BadNodes, Pid <- orddict:fetch(BadNode, Grouped)], ResultsNoNode = lists:append([safe_invoke(LocalPids, Fun) | diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 52d76ac48b..b99cb05199 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -344,8 +344,8 @@ throw_on_error(E, Thunk) -> with_exit_handler(Handler, Thunk) -> try Thunk() - catch - exit:{R, _} when R =:= noproc; R =:= normal; R =:= shutdown -> + catch exit:{R, _} when R =:= noproc; R =:= nodedown; + R =:= normal; R =:= shutdown -> Handler() end. |