Skip to content

Commit 833a9da

Browse files
Merge pull request #1365 from rabbitmq/rabbitmq-server-1364
Do not log anything when list of apps to stop is empty
2 parents 8e61c4f + bbaf45f commit 833a9da

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/rabbit.erl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,8 @@ decrypt_list([{Key, Value}|Tail], Algo, Acc) when Key =/= encrypted ->
582582
decrypt_list([Value|Tail], Algo, Acc) ->
583583
decrypt_list(Tail, Algo, [decrypt(Value, Algo)|Acc]).
584584

585+
stop_apps([]) ->
586+
ok;
585587
stop_apps(Apps) ->
586588
rabbit_log:info(
587589
lists:flatten(["Stopping RabbitMQ applications and their dependencies in the following order:~n",

src/rabbit_plugins.erl

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,19 @@ ensure(FileJustChanged0) ->
5454
{disabled, Stop}]),
5555
rabbit:stop_apps(Stop),
5656
clean_plugins(Stop),
57-
rabbit_log:info("Plugins changed; enabled ~p, disabled ~p~n",
58-
[Start, Stop]),
57+
case {Start, Stop} of
58+
{[], []} ->
59+
ok;
60+
{[], _} ->
61+
rabbit_log:info("Plugins changed; disabled ~p~n",
62+
[Stop]);
63+
{_, []} ->
64+
rabbit_log:info("Plugins changed; enabled ~p~n",
65+
[Start]);
66+
{_, _} ->
67+
rabbit_log:info("Plugins changed; enabled ~p, disabled ~p~n",
68+
[Start, Stop])
69+
end,
5970
{ok, Start, Stop};
6071
_ ->
6172
{error, {enabled_plugins_mismatch, FileJustChanged, OurFile}}

0 commit comments

Comments
 (0)