diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2021-03-04 13:08:22 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2021-03-04 13:09:29 +0300 |
| commit | 01c4ca2aa919922bb1da921674a87d1b96ec0528 (patch) | |
| tree | 5ea41cd4c84e1537002a1f6cbce1c7ad4c963d5e | |
| parent | 8920f05a15413586ddda7e5626b412fb02511cf9 (diff) | |
| download | rabbitmq-server-git-01c4ca2aa919922bb1da921674a87d1b96ec0528.tar.gz | |
Make rabbit_log:log/2 return 'ok' unconditionally
instead of relying on a Lager transform-driven return value.
This should avoid erlang/otp#4576 on Erlang 24.
Per discussion with @lhoguin.
| -rw-r--r-- | deps/rabbit_common/src/rabbit_log.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/deps/rabbit_common/src/rabbit_log.erl b/deps/rabbit_common/src/rabbit_log.erl index 910389b9e0..577ecb00a0 100644 --- a/deps/rabbit_common/src/rabbit_log.erl +++ b/deps/rabbit_common/src/rabbit_log.erl @@ -74,7 +74,8 @@ log(Category, Level, Fmt, Args) when is_list(Args) -> default -> ?LAGER_SINK; _ -> make_internal_sink_name(Category) end, - lager:log(Sink, Level, self(), Fmt, Args). + lager:log(Sink, Level, self(), Fmt, Args), + ok. %% logger(3) handler. log(#{level := Level, @@ -100,7 +101,8 @@ log(#{level := Level, lager:log(?LAGER_SINK, Level, Pid, "~ts", [String]); {Format, Args} when is_list(Format) -> lager:log(?LAGER_SINK, Level, Pid, Format, Args) - end. + end, + ok. make_internal_sink_name(channel) -> rabbit_log_channel_lager_event; make_internal_sink_name(connection) -> rabbit_log_connection_lager_event; |
