diff options
| author | Michael Klishin <michael@novemberain.com> | 2017-09-15 20:21:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 20:21:21 -0600 |
| commit | 833a9da2567867775833e19973c31f732a459464 (patch) | |
| tree | 01f21e4eebe1a546b58f773fa3a59c538ef69c37 | |
| parent | 8e61c4fbd5eb04313d1a77c42c30fde80f8a7edf (diff) | |
| parent | bbaf45f2a80ebd7033ee429826ed2deca6f07929 (diff) | |
| download | rabbitmq-server-git-833a9da2567867775833e19973c31f732a459464.tar.gz | |
Merge pull request #1365 from rabbitmq/rabbitmq-server-1364
Do not log anything when list of apps to stop is empty
| -rw-r--r-- | src/rabbit.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_plugins.erl | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index fbd8840c38..93f5230250 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -582,6 +582,8 @@ decrypt_list([{Key, Value}|Tail], Algo, Acc) when Key =/= encrypted -> decrypt_list([Value|Tail], Algo, Acc) -> decrypt_list(Tail, Algo, [decrypt(Value, Algo)|Acc]). +stop_apps([]) -> + ok; stop_apps(Apps) -> rabbit_log:info( lists:flatten(["Stopping RabbitMQ applications and their dependencies in the following order:~n", diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl index 7c1217c543..10906575f1 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -54,8 +54,19 @@ ensure(FileJustChanged0) -> {disabled, Stop}]), rabbit:stop_apps(Stop), clean_plugins(Stop), - rabbit_log:info("Plugins changed; enabled ~p, disabled ~p~n", - [Start, Stop]), + case {Start, Stop} of + {[], []} -> + ok; + {[], _} -> + rabbit_log:info("Plugins changed; disabled ~p~n", + [Stop]); + {_, []} -> + rabbit_log:info("Plugins changed; enabled ~p~n", + [Start]); + {_, _} -> + rabbit_log:info("Plugins changed; enabled ~p, disabled ~p~n", + [Start, Stop]) + end, {ok, Start, Stop}; _ -> {error, {enabled_plugins_mismatch, FileJustChanged, OurFile}} |