Use a list of commands that do not require rabbit app to be running

1 files changed, 4 insertions, 13 deletions

diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index 23d019d8..0d0e71a5 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -114,16 +114,8 @@
          {"Policies",   rabbit_policy,             list_formatted, info_keys},
          {"Parameters", rabbit_runtime_parameters, list_formatted, info_keys}]).
 
--define(COMMANDS_THAT_REQUIRE_RABBIT_APP_TO_BE_RUNNING,
-       [status, cluster_status, environment, rotate_logs,
-        close_connection, add_user, delete_user, change_password,
-        clear_password, set_user_tags, list_users, add_vhost,
-        delete_vhost, list_vhosts, list_user_permissions, list_queues,
-        list_exchanges, list_bindings, list_connections,
-        list_channels, list_consumers, trace_on, trace_off,
-        set_vm_memory_high_watermark, set_permissions, clear_permissions,
-        list_permissions, set_parameter, clear_parameter, list_parameters,
-        set_policy, clear_policy, list_policies, report, eval]).
+-define(COMMANDS_THAT_DO_NOT_REQUIRE_RABBIT_APP_TO_BE_RUNNING,
+       [start_app, stop_app, status, cluster_status, environment, eval, rotate_logs]).
 
 %%----------------------------------------------------------------------------
 
@@ -151,11 +143,11 @@ start() ->
         end,
     Quiet = proplists:get_bool(?QUIET_OPT, Opts),
     Node = proplists:get_value(?NODE_OPT, Opts),
-    case lists:member(Command, ?COMMANDS_THAT_REQUIRE_RABBIT_APP_TO_BE_RUNNING) of
+    case lists:member(Command, ?COMMANDS_THAT_DO_NOT_REQUIRE_RABBIT_APP_TO_BE_RUNNING) of
         true ->
-            quit_if_rabbit_app_is_not_running(Node),
             ok;
         false ->
+            quit_if_rabbit_app_is_not_running(Node),
             ok
     end,
     Inform = case Quiet of
@@ -563,7 +555,6 @@ action(set_cluster_name, Node, [Name], _Opts, Inform) ->
     rpc_call(Node, rabbit_nodes, set_cluster_name, [list_to_binary(Name)]);
 
 action(eval, Node, [Expr], _Opts, _Inform) ->
-    quit_if_rabbit_app_is_not_running(Node),
     case erl_scan:string(Expr) of
         {ok, Scanned, _} ->
             case erl_parse:parse_exprs(Scanned) of