diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2018-01-24 19:07:45 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2018-01-24 19:07:45 +0300 |
| commit | 8a602070022c414366ef1ecba1cc23481b6643bd (patch) | |
| tree | 1dc36ee65fca913bf71c993d2554565e6f0a8ef9 /src | |
| parent | 3dee917b941aa7db267b099e2fbd63267b6b77c0 (diff) | |
| parent | cef9d18ee171b1b15bb77dcf7f4793c3c043eece (diff) | |
| download | rabbitmq-server-git-8a602070022c414366ef1ecba1cc23481b6643bd.tar.gz | |
Merge branch 'v3.7.x' into rabbitmq-server-vhost-sup-sup-badarg
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. |