root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Upgrade Lager to 3.9.0 for OTP 24 compatibility 

`lager_util:expand_path/1` use changes are
due to erlang-lager/lager#540
This commit is contained in:
Michael Klishin 2021-02-26 00:52:15 +03:00
parent 3430906ad8
commit 8fe3df9343
No known key found for this signature in database
GPG Key ID: E80EDCFA0CDB21EE
42 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbit/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

5
deps/rabbit/src/rabbit_lager.erl vendored
View File

@ -178,7 +178,7 @@ lager_file_name(_) ->
lager_file_name1(Settings) when is_list(Settings) ->
{file, FileName} = proplists:lookup(file, Settings),
lager_util:expand_path(FileName);
FileName;
lager_file_name1({FileName, _}) -> lager_util:expand_path(FileName);
lager_file_name1({FileName, _, _, _, _}) -> lager_util:expand_path(FileName);
lager_file_name1(_) ->
@ -186,8 +186,7 @@ lager_file_name1(_) ->
lager_file_backend_config_invalid}}).
ensure_logfile_exist(FileName) ->
LogFile = lager_util:expand_path(FileName),
ensure_logfile_exist(LogFile) ->
case rabbit_file:read_file_info(LogFile) of
{ok,_} -> ok;
{error, Err} -> throw({error, {cannot_log_to_file, LogFile, Err}})

3
deps/rabbit/src/rabbit_prelaunch_logging.erl vendored
View File

@ -56,7 +56,8 @@ configure_lager(#{log_base_dir := LogBaseDir,
UpgradeLog}
end,
ok = application:set_env(lager, crash_log, "log/crash.log"),
%% see https://github.com/erlang-lager/lager/pull/540
ok = application:set_env(lager, crash_log, "crash.log"),
Fun = fun({App, Var, Value}) ->
case application:get_env(App, Var) of

2
deps/rabbit_common/mk/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_amqp1_0/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_auth_backend_cache/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_auth_backend_http/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_auth_backend_ldap/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_auth_backend_oauth2/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_auth_mechanism_ssl/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_consistent_hash_exchange/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_event_exchange/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_federation/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_federation_management/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_jms_topic_exchange/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_management/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_management_agent/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_mqtt/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_peer_discovery_aws/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_peer_discovery_common/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_peer_discovery_consul/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_peer_discovery_etcd/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_peer_discovery_k8s/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_prometheus/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_random_exchange/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_recent_history_exchange/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_sharding/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_shovel/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_shovel_management/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_stomp/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_stream/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_stream_management/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_stream_prometheus/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_top/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_tracing/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_trust_store/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_web_dispatch/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_web_mqtt/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_web_mqtt_examples/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_web_stomp/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
deps/rabbitmq_web_stomp_examples/rabbitmq-components.mk vendored
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1

2
rabbitmq-components.mk
View File

@ -117,7 +117,7 @@ dep_accept = hex 0.3.5
dep_cowboy = hex 2.8.0
dep_cowlib = hex 2.9.1
dep_jsx = hex 2.11.0
dep_lager = hex 3.8.2
dep_lager = hex 3.9.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1