diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-09-15 20:21:45 -0600 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-09-15 20:21:45 -0600 |
| commit | 049330ec13764d6acc729ee4905049e28efa8200 (patch) | |
| tree | 5101c89db60e89790cd323c81500fd68c2b0cac6 /src | |
| parent | 827836d14f7ad2c37e2957db8f29100d62c335e9 (diff) | |
| parent | 833a9da2567867775833e19973c31f732a459464 (diff) | |
| download | rabbitmq-server-git-049330ec13764d6acc729ee4905049e28efa8200.tar.gz | |
Merge branch 'stable'v3.7.0-rc.1
Diffstat (limited to 'src')
| -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 0a0eb6b71a..cc1e0e08c4 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -621,6 +621,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 73488663d5..7c202a0b3d 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -64,8 +64,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}} |