yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unload emqx_alarm_handler before unloading plugins when shuting down (#2316) 

emqx_alarm_handler publishes mqtt messages,
having it running while plugins are shutdown triggered some
annoying crashes
This commit is contained in:
spring2maz 2019-03-15 10:11:24 +01:00 committed by turtleDeng
parent b902ff3656
commit f2df92fef2
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emqx.erl
View File

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

5
src/emqx_alarm_handler.erl
View File

@ -32,6 +32,7 @@
terminate/2]). terminate/2]).
-export([load/0, -export([load/0,
unload/0,
get_alarms/0]). get_alarms/0]).
-record(common_alarm, {id, desc}). -record(common_alarm, {id, desc}).
@ -68,6 +69,10 @@ mnesia(copy) ->
load() -> load() ->
gen_event:swap_handler(alarm_handler, {alarm_handler, swap}, {?MODULE, []}). 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() -> get_alarms() ->
gen_event:call(alarm_handler, ?MODULE, get_alarms). gen_event:call(alarm_handler, ?MODULE, get_alarms).