Update for rabbitmq-sysmon -> sysmon-handler rename

Author: lukebakken

Makefile

@@ -138,7 +138,7 @@ endef
 
 LOCAL_DEPS = sasl mnesia os_mon inets
 BUILD_DEPS = rabbitmq_cli syslog
-DEPS = ranch lager rabbit_common ra rabbit_sysmon
+DEPS = ranch lager rabbit_common ra sysmon_handler
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client meck proper
 
 dep_syslog = git https://github.com/schlagert/syslog 3.4.5

rabbitmq-components.mk

@@ -113,7 +113,7 @@ dep_cowlib = hex 2.7.0
 dep_jsx = hex 2.9.0
 dep_lager = hex 3.6.5
 dep_ra = git https://github.com/rabbitmq/ra.git master
-dep_rabbit_sysmon = git https://github.com/rabbitmq/rabbitmq-sysmon.git master
+dep_sysmon_handler = git https://github.com/rabbitmq/sysmon-handler.git master
 dep_ranch = hex 1.7.1
 dep_recon = hex 2.3.6
 

src/rabbit.erl

@@ -156,10 +156,10 @@
                     {requires,    kernel_ready},
                     {enables,     core_initialized}]}).
 
--rabbit_boot_step({sysmon_minder,
+-rabbit_boot_step({rabbit_sysmon_minder,
                    [{description, "sysmon_handler supervisor"},
                     {mfa,         {rabbit_sup, start_restartable_child,
-                                   [sysmon_minder]}},
+                                   [rabbit_sysmon_minder]}},
                     {requires,    kernel_ready},
                     {enables,     core_initialized}]}).
 
@@ -232,7 +232,7 @@
 -include("rabbit_framing.hrl").
 -include("rabbit.hrl").
 
--define(APPS, [os_mon, mnesia, rabbit_common, ra, rabbit_sysmon, rabbit]).
+-define(APPS, [os_mon, mnesia, rabbit_common, ra, sysmon_handler, rabbit]).
 
 -define(ASYNC_THREADS_WARNING_THRESHOLD, 8).
 

src/sysmon_handler.erl renamed to src/rabbit_sysmon_handler.erl

@@ -15,13 +15,13 @@
 %% specific language governing permissions and limitations
 %% under the License.
 
-%% @doc A custom event handler to the `rabbit_sysmon' application's
+%% @doc A custom event handler to the `sysmon_handler' application's
 %% `system_monitor' event manager.
 %%
 %% This module attempts to discover more information about a process
 %% that generates a system_monitor event.
 
--module(sysmon_handler).
+-module(rabbit_sysmon_handler).
 
 -behaviour(gen_event).
 
@@ -43,12 +43,11 @@
 add_handler() ->
     %% Vulnerable to race conditions (installing handler multiple
     %% times), but risk is zero in the common OTP app startup case.
-    case lists:member(?MODULE,
-                      gen_event:which_handlers(rabbit_sysmon_handler)) of
+    case lists:member(?MODULE, gen_event:which_handlers(sysmon_handler)) of
         true ->
             ok;
         false ->
-            rabbit_sysmon_filter:add_custom_handler(?MODULE, [])
+            sysmon_handler_filter:add_custom_handler(?MODULE, [])
     end.
 
 %%%===================================================================
@@ -90,11 +89,11 @@ handle_event({monitor, PidOrPort, Type, Info}, State=#state{timer_ref=TimerRef})
     %% Reset the inactivity timeout
     NewTimerRef = reset_timer(TimerRef),
     {Fmt, Args} = format_pretty_proc_or_port_info(PidOrPort),
-    rabbit_log:info("monitor ~w ~w " ++ Fmt ++ " ~w", [Type, PidOrPort] ++ Args ++ [Info]),
+    rabbit_log:warning("~p ~w ~w " ++ Fmt ++ " ~w", [?MODULE, Type, PidOrPort] ++ Args ++ [Info]),
     {ok, State#state{timer_ref=NewTimerRef}};
 handle_event(Event, State=#state{timer_ref=TimerRef}) ->
     NewTimerRef = reset_timer(TimerRef),
-    rabbit_log:info("Monitor got ~p", [Event]),
+    rabbit_log:warning("~p unhandled event: ~p", [?MODULE, Event]),
     {ok, State#state{timer_ref=NewTimerRef}}.
 
 %%--------------------------------------------------------------------
@@ -177,8 +176,8 @@ format_pretty_proc_or_port_info(PidOrPort) ->
     end.
 
 get_pretty_proc_or_port_info(Pid) when is_pid(Pid) ->
-    case process_info(Pid, [registered_name, initial_call, current_function,
-                            message_queue_len]) of
+    Infos = [registered_name, initial_call, current_function, message_queue_len],
+    case process_info(Pid, Infos) of
         undefined ->
             undefined;
         [] ->

src/sysmon_minder.erl renamed to src/rabbit_sysmon_minder.erl

@@ -18,7 +18,7 @@
 %%
 %% -------------------------------------------------------------------
 
--module(sysmon_minder).
+-module(rabbit_sysmon_minder).
 
 -behaviour(gen_server).
 
@@ -68,7 +68,7 @@ init([]) ->
     %% sysmon_handler gen_event server.  (If we had a supervisor
     %% or app-starting process add the handler, then if the handler
     %% crashes, nobody will act on the crash notification.)
-    sysmon_handler:add_handler(),
+    rabbit_sysmon_handler:add_handler(),
     {ok, #state{}}.
 
 %%--------------------------------------------------------------------
@@ -112,7 +112,7 @@ handle_cast(_Msg, State) ->
 %%                                   {stop, Reason, State}
 %% @end
 %%--------------------------------------------------------------------
-handle_info({gen_event_EXIT, sysmon_handler, _}, State) ->
+handle_info({gen_event_EXIT, rabbit_sysmon_handler, _}, State) ->
     %% SASL will create an error message, no need for us to duplicate it.
     %%
     %% Our handler should never crash, but it did indeed crash.  If
@@ -125,7 +125,7 @@ handle_info({gen_event_EXIT, sysmon_handler, _}, State) ->
     %% miss a few seconds of system_monitor events, the world will not
     %% end.
     timer:sleep(2*1000),
-    sysmon_handler:add_handler(),
+    rabbit_sysmon_handler:add_handler(),
     {noreply, State};
 handle_info(_Info, State) ->
     {noreply, State}.