summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2014-03-28 16:14:58 +0000
committerTim Watson <tim@rabbitmq.com>2014-03-28 16:14:58 +0000
commitc2ad129d241492576f039419e83dcc53ed4f0f5c (patch)
tree5f7f36821cf3a750aa8efd929fdfc04e90a5567d
parent28eb8a62293a26c3cdbc142503a1cd3de6e439c8 (diff)
downloadrabbitmq-server-c2ad129d241492576f039419e83dcc53ed4f0f5c.tar.gz
Calculate the enabled set properly and tweak the UI
-rw-r--r--src/rabbit_plugins_main.erl8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/rabbit_plugins_main.erl b/src/rabbit_plugins_main.erl
index 7209d735..b9fdfcd0 100644
--- a/src/rabbit_plugins_main.erl
+++ b/src/rabbit_plugins_main.erl
@@ -132,7 +132,7 @@ action(enable, Node, ToEnable0, Opts, PluginsFile, PluginsDir) ->
OfflineOnly = proplists:get_bool(?OFFLINE_OPT, Opts),
NewEnabled =
case OfflineOnly of
- true -> ExplicitlyEnabled;
+ true -> ToEnable -- Enabled;
false ->
case rpc:call(Node, rabbit_plugins, active, [], ?RPC_TIMEOUT) of
{badrpc, _} -> rpc_failure(Node);
@@ -332,10 +332,8 @@ write_enabled_plugins(PluginsFile, Plugins) ->
end.
action_change(true, _Node, Action, _Targets) ->
- io:format("Plugin configuration has changed. "
- "Plugins were not ~p since the node is down.~n"
- "Please start the broker to apply "
- "your changes.~n",
+ io:format("Offline Mode: No plugins were ~p.~n"
+ "Please (re)start the broker to apply your changes.~n",
[case Action of
enable -> started;
disable -> stopped