Merge remote-tracking branch 'origin/develop'

Makefile

@@ -7,7 +7,7 @@ DEPS = jsx gproc gen_rpc ekka esockd cowboy replayq
 
 dep_jsx     = hex-emqx 2.9.0
 dep_gproc   = hex-emqx 0.8.0
-dep_gen_rpc = git-emqx https://github.com/emqx/gen_rpc 2.3.0
+dep_gen_rpc = git-emqx https://github.com/emqx/gen_rpc 2.3.1
 dep_esockd  = git-emqx https://github.com/emqx/esockd v5.4.4
 dep_ekka    = git-emqx https://github.com/emqx/ekka v0.5.3
 dep_cowboy  = hex-emqx 2.4.0

rebar.config

@@ -6,7 +6,7 @@
 
 %% appended to deps in rebar.config.script
 {github_emqx_deps,
-    [{gen_rpc, "2.3.0"},
+    [{gen_rpc, "2.3.1"},
      {ekka, "v0.5.3"},
      {replayq, "v0.1.1"},
      {esockd, "v5.4.4"},

src/emqx.erl

@@ -159,6 +159,7 @@ shutdown() ->
 
 shutdown(Reason) ->
     emqx_logger:error("emqx shutdown for ~s", [Reason]),
+    emqx_alarm_handler:unload(),
     emqx_plugins:unload(),
     lists:foreach(fun application:stop/1, [emqx, ekka, cowboy, ranch, esockd, gproc]).
 

src/emqx_alarm_handler.erl

@@ -32,6 +32,7 @@
          terminate/2]).
 
 -export([load/0,
+         unload/0,
          get_alarms/0]).
 
 -record(common_alarm, {id, desc}).
@@ -68,6 +69,10 @@ mnesia(copy) ->
 load() ->
     gen_event:swap_handler(alarm_handler, {alarm_handler, swap}, {?MODULE, []}).
 
+%% on the way shutting down, give it back to OTP
+unload() ->
+    gen_event:swap_handler(alarm_handler, {?MODULE, swap}, {alarm_handler, []}).
+
 get_alarms() ->
     gen_event:call(alarm_handler, ?MODULE, get_alarms).