log various ctl actions

6 files changed, 33 insertions, 7 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index b8dbccc767..6a0363cf33 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -224,12 +224,15 @@ start() ->
     end.
 
 stop() ->
+    rabbit_log:info("Stopping Rabbit~n"),
     ok = rabbit_misc:stop_applications(application_load_order()).
 
 stop_and_halt() ->
     try
         stop()
     after
+        rabbit_misc:with_local_io(
+          fun () -> error_logger:info_msg("Halting Erlang VM~n") end),
         init:stop()
     end,
     ok.
@@ -255,6 +258,10 @@ environment() ->
                K =/= default_pass]).
 
 rotate_logs(BinarySuffix) ->
+    rabbit_misc:with_local_io(
+      fun () -> error_logger:info_msg("Rotating logs with suffix '~s'~n",
+                                      [BinarySuffix])
+      end),
     Suffix = binary_to_list(BinarySuffix),
     log_rotation_result(rotate_logs(log_location(kernel),
                                     Suffix,
diff --git a/src/rabbit_auth_backend_internal.erl b/src/rabbit_auth_backend_internal.erl
index 6a018bd16d..f8a8e58746 100644
--- a/src/rabbit_auth_backend_internal.erl
+++ b/src/rabbit_auth_backend_internal.erl
@@ -150,6 +150,7 @@ permission_index(read)      -> #permission.read.
 %% Manipulation of the user database
 
 add_user(Username, Password) ->
+    rabbit_log:info("Creating user '~s'~n", [Username]),
     R = rabbit_misc:execute_mnesia_transaction(
           fun () ->
                   case mnesia:wread({rabbit_user, Username}) of
@@ -165,10 +166,10 @@ add_user(Username, Password) ->
                           mnesia:abort({user_already_exists, Username})
                   end
           end),
-    rabbit_log:info("Created user ~p~n", [Username]),
     R.
 
 delete_user(Username) ->
+    rabbit_log:info("Deleting user '~s'~n", [Username]),
     R = rabbit_misc:execute_mnesia_transaction(
           rabbit_misc:with_user(
             Username,
@@ -185,13 +186,14 @@ delete_user(Username) ->
                                write)],
                     ok
             end)),
-    rabbit_log:info("Deleted user ~p~n", [Username]),
     R.
 
 change_password(Username, Password) ->
+    rabbit_log:info("Changing password for '~s'~n", [Username]),
     change_password_hash(Username, hash_password(Password)).
 
 clear_password(Username) ->
+    rabbit_log:info("Clearing password for '~s'~n", [Username]),
     change_password_hash(Username, <<"">>).
 
 change_password_hash(Username, PasswordHash) ->
@@ -199,7 +201,6 @@ change_password_hash(Username, PasswordHash) ->
                                       User#internal_user{
                                         password_hash = PasswordHash }
                               end),
-    rabbit_log:info("Changed password for user ~p~n", [Username]),
     R.
 
 hash_password(Cleartext) ->
@@ -221,11 +222,10 @@ salted_md5(Salt, Cleartext) ->
     erlang:md5(Salted).
 
 set_tags(Username, Tags) ->
+    rabbit_log:info("Setting user tags for user '~s' to ~p~n", [Username, Tags]),
     R = update_user(Username, fun(User) ->
                                       User#internal_user{tags = Tags}
                               end),
-    rabbit_log:info("Set user tags for user ~p to ~p~n",
-                    [Username, Tags]),
     R.
 
 update_user(Username, Fun) ->
@@ -255,6 +255,8 @@ validate_regexp(RegexpBin) ->
     end.
 
 set_permissions(Username, VHostPath, ConfigurePerm, WritePerm, ReadPerm) ->
+    rabbit_log:info("Setting permissions for '~s' in '~s' to '~s', '~s', '~s'~n",
+                    [Username, VHostPath, ConfigurePerm, WritePerm, ReadPerm]),
     lists:map(fun validate_regexp/1, [ConfigurePerm, WritePerm, ReadPerm]),
     rabbit_misc:execute_mnesia_transaction(
       rabbit_misc:with_user_and_vhost(
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 1ea909714e..913029de02 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -119,6 +119,13 @@ force_cluster(ClusterNodes) ->
 %% node.  If Force is false, only connections to online nodes are
 %% allowed.
 cluster(ClusterNodes, Force) ->
+    rabbit_misc:with_local_io(
+      fun () -> error_logger:info_msg("Clustering with ~p~s~n",
+                                      [ClusterNodes, if Force -> " forcefully";
+                                                        true  -> ""
+                                                     end])
+      end),
+
     ensure_mnesia_not_running(),
     ensure_mnesia_dir(),
 
@@ -716,6 +723,13 @@ wait_for_tables(TableNames) ->
     end.
 
 reset(Force) ->
+    rabbit_misc:with_local_io(
+      fun () ->
+              error_logger:info_msg("Resetting Rabbit~s~n",
+                                    [if Force -> " forcefully";
+                                        true  -> ""
+                                     end])
+      end),
     ensure_mnesia_not_running(),
     case not Force andalso is_clustered() andalso
          is_only_disc_node(node(), false)
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index b2abcba651..2f0160cdac 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -293,6 +293,7 @@ connection_info_all() -> cmap(fun (Q) -> connection_info(Q) end).
 connection_info_all(Items) -> cmap(fun (Q) -> connection_info(Q, Items) end).
 
 close_connection(Pid, Explanation) ->
+    rabbit_log:info("Closing connection ~p because ~p~n", [Pid, Explanation]),
     case lists:member(Pid, connections()) of
         true  -> rabbit_reader:shutdown(Pid, Explanation);
         false -> throw({error, {not_a_connection_pid, Pid}})
diff --git a/src/rabbit_trace.erl b/src/rabbit_trace.erl
index f9632324be..58079ccf47 100644
--- a/src/rabbit_trace.erl
+++ b/src/rabbit_trace.erl
@@ -67,9 +67,11 @@ tap_trace_out({#resource{name = QName}, _QPid, _QMsgId, Redelivered, Msg},
 %%----------------------------------------------------------------------------
 
 start(VHost) ->
+    rabbit_log:info("Enabling tracing for vhost '~s'~n", [VHost]),
     update_config(fun (VHosts) -> [VHost | VHosts -- [VHost]] end).
 
 stop(VHost) ->
+    rabbit_log:info("Disabling tracing for vhost '~s'~n", [VHost]),
     update_config(fun (VHosts) -> VHosts -- [VHost] end).
 
 update_config(Fun) ->
diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl
index 08d6c99a9c..38bb76b03b 100644
--- a/src/rabbit_vhost.erl
+++ b/src/rabbit_vhost.erl
@@ -44,6 +44,7 @@
 -define(INFO_KEYS, [name, tracing]).
 
 add(VHostPath) ->
+    rabbit_log:info("Adding vhost '~s'~n", [VHostPath]),
     R = rabbit_misc:execute_mnesia_transaction(
           fun () ->
                   case mnesia:wread({rabbit_vhost, VHostPath}) of
@@ -69,7 +70,6 @@ add(VHostPath) ->
                            {<<"amq.rabbitmq.trace">>, topic}]],
                   ok
           end),
-    rabbit_log:info("Added vhost ~p~n", [VHostPath]),
     R.
 
 delete(VHostPath) ->
@@ -78,6 +78,7 @@ delete(VHostPath) ->
     %% process, which in turn results in further mnesia actions and
     %% eventually the termination of that process. Exchange deletion causes
     %% notifications which must be sent outside the TX
+    rabbit_log:info("Deleting vhost '~s'~n", [VHostPath]),
     [{ok,_} = rabbit_amqqueue:delete(Q, false, false) ||
         Q <- rabbit_amqqueue:list(VHostPath)],
     [ok = rabbit_exchange:delete(Name, false) ||
@@ -86,7 +87,6 @@ delete(VHostPath) ->
           with(VHostPath, fun () ->
                                   ok = internal_delete(VHostPath)
                           end)),
-    rabbit_log:info("Deleted vhost ~p~n", [VHostPath]),
     R.
 
 internal_delete(VHostPath) ->