diff options
| author | Michael Klishin <michael@novemberain.com> | 2019-01-29 02:33:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 02:33:30 +0300 |
| commit | b75d2b3e210c623eee21fd8dadca1518202c2d35 (patch) | |
| tree | f703951a1d968c1cfff0512b03c55691d83a09a3 /src | |
| parent | bffd562001b9e2657eb69e2688dc503f241b2df7 (diff) | |
| parent | 9ffe57e5617263aee33a03d79e82d017e7cb9f30 (diff) | |
| download | rabbitmq-server-git-b75d2b3e210c623eee21fd8dadca1518202c2d35.tar.gz | |
Merge pull request #1851 from rabbitmq/rabbitmq-server-1850
Remove code that sets syslog listen IP
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_lager.erl | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/src/rabbit_lager.erl b/src/rabbit_lager.erl index 35304f13e0..1a72d15009 100644 --- a/src/rabbit_lager.erl +++ b/src/rabbit_lager.erl @@ -307,36 +307,6 @@ configure_syslog_error_logger() -> _ -> ok end. --define(SYSLOG_LOCAL_IP, {ip,{127,0,0,1}}). -configure_syslog() -> - ok = app_utils:load_applications([syslog]), - %% https://github.com/schlagert/syslog#configuration - Protocol = case application:get_env(syslog, protocol) of - undefined -> - {rfc3164, udp, [?SYSLOG_LOCAL_IP]}; - %% {protocol, - %% rfc3164 | - %% rfc5424 | - %% {rfc3164 | rfc5424, tcp | udp} | - %% {rfc3164 | rfc5424, udp, [gen_udp:option()]} | - %% {rfc3164 | rfc5424, tcp, [gen_tcp:option()]} | - %% {rfc5424, tls, [ssl:connect_option()]} - %% } - {ok, Rfc} when Rfc =:= rfc3164; Rfc =:= rfc5424 -> - {Rfc, udp, [?SYSLOG_LOCAL_IP]}; - {ok, {Rfc, Transport}} when Rfc =:= rfc3164; Rfc =:= rfc5424 -> - {Rfc, Transport, [?SYSLOG_LOCAL_IP]}; - {ok, {Rfc, Transport, Opts}} when Rfc =:= rfc3164; Rfc =:= rfc5424 -> - case proplists:lookup(ip, Opts) of - none -> - {Rfc, Transport, [?SYSLOG_LOCAL_IP|Opts]}; - _ -> - {Rfc, Transport, Opts} - end - end, - ok = application:unset_env(syslog, protocol), - ok = application:set_env(syslog, protocol, Protocol). - remove_rabbit_handlers(Handlers, FormerHandlers) -> lists:filter(fun(Handler) -> not lists:member(Handler, FormerHandlers) @@ -380,7 +350,7 @@ lager_backend(exchange) -> lager_exchange_backend. generate_handler(syslog_lager_backend, HandlerConfig) -> DefaultConfigVal = default_config_value(level), Level = proplists:get_value(level, HandlerConfig, DefaultConfigVal), - ok = configure_syslog(), + ok = app_utils:load_applications([syslog]), [{syslog_lager_backend, [Level, {}, |