diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-01-24 17:26:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 17:26:12 +0300 |
| commit | cef9d18ee171b1b15bb77dcf7f4793c3c043eece (patch) | |
| tree | a68732bc9a84093a5d950b72082e7aa6f1b1b109 /src | |
| parent | affb941c94de205c304b8e4ea2dc3270896fe9bc (diff) | |
| parent | 5570b18f5e26096927adffd0c6f2cbcc747ed346 (diff) | |
| download | rabbitmq-server-git-cef9d18ee171b1b15bb77dcf7f4793c3c043eece.tar.gz | |
Merge pull request #1477 from rabbitmq/rabbitmq-server-channel-interceptor-hang
Make sure rabbit_misc:pmap callbacks do not throw.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index c671438ce8..1de367e70c 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -361,13 +361,29 @@ emit_info(PidList, InfoItems, Ref, AggregatorPid) -> refresh_config_local() -> rabbit_misc:upmap( - fun (C) -> gen_server2:call(C, refresh_config, infinity) end, + fun (C) -> + try + gen_server2:call(C, refresh_config, infinity) + catch _:Reason -> + rabbit_log:error("Failed to refresh channel config " + "for channel ~p. Reason ~p", + [C, Reason]) + end + end, list_local()), ok. refresh_interceptors() -> rabbit_misc:upmap( - fun (C) -> gen_server2:call(C, refresh_interceptors, ?REFRESH_TIMEOUT) end, + fun (C) -> + try + gen_server2:call(C, refresh_interceptors, ?REFRESH_TIMEOUT) + catch _:Reason -> + rabbit_log:error("Failed to refresh channel interceptors " + "for channel ~p. Reason ~p", + [C, Reason]) + end + end, list_local()), ok. |