From fffbd3dd1ed84dc184dfc96b5155df10281dc838 Mon Sep 17 00:00:00 2001 From: Feng Date: Tue, 22 Mar 2016 18:14:13 +0800 Subject: [PATCH 1/4] hibernate --- src/emqttd_broker.erl | 2 +- src/emqttd_sysmon.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emqttd_broker.erl b/src/emqttd_broker.erl index 4c2024972..f7518a894 100644 --- a/src/emqttd_broker.erl +++ b/src/emqttd_broker.erl @@ -139,7 +139,7 @@ handle_cast(Msg, State) -> handle_info(heartbeat, State) -> publish(uptime, list_to_binary(uptime(State))), publish(datetime, list_to_binary(datetime())), - {noreply, State}; + {noreply, State, hibernate}; handle_info(tick, State) -> retain(brokers), diff --git a/src/emqttd_sysmon.erl b/src/emqttd_sysmon.erl index 393f5f5a0..a262ffc5e 100644 --- a/src/emqttd_sysmon.erl +++ b/src/emqttd_sysmon.erl @@ -127,7 +127,7 @@ handle_info({monitor, SusPid, busy_dist_port, Port}, State) -> end, State); handle_info(reset, State) -> - {noreply, State#state{events = []}}; + {noreply, State#state{events = []}, hibernate}; handle_info(Info, State) -> ?UNEXPECTED_INFO(Info, State). From d07c94ad6848872794b3c2f1884325f60b72d761 Mon Sep 17 00:00:00 2001 From: Feng Date: Fri, 25 Mar 2016 16:15:08 +0800 Subject: [PATCH 2/4] dispatch.png --- docs/source/_static/dispatch.png | Bin 0 -> 10582 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/source/_static/dispatch.png diff --git a/docs/source/_static/dispatch.png b/docs/source/_static/dispatch.png new file mode 100644 index 0000000000000000000000000000000000000000..11d2c6567ec1054f275db26665ffa52da6c0616c GIT binary patch literal 10582 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 fFq&un@~V{8%ZFG^;Wxp& Date: Fri, 25 Mar 2016 16:30:22 +0800 Subject: [PATCH 3/4] upgrade redis plugin --- plugins/emqttd_plugin_redis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/emqttd_plugin_redis b/plugins/emqttd_plugin_redis index ef0971ede..c040fb674 160000 --- a/plugins/emqttd_plugin_redis +++ b/plugins/emqttd_plugin_redis @@ -1 +1 @@ -Subproject commit ef0971ede89fd5c45c22779edd0e9eb7a0420869 +Subproject commit c040fb6749cf7abcad07ed026ba7116b21fc2632 From fa079a3014b7508f578960d32fc44f3227cf2a3b Mon Sep 17 00:00:00 2001 From: Feng Date: Sat, 26 Mar 2016 08:47:21 +0800 Subject: [PATCH 4/4] upgrade redis plugin --- plugins/emqttd_plugin_redis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/emqttd_plugin_redis b/plugins/emqttd_plugin_redis index c040fb674..9fef7a1b7 160000 --- a/plugins/emqttd_plugin_redis +++ b/plugins/emqttd_plugin_redis @@ -1 +1 @@ -Subproject commit c040fb6749cf7abcad07ed026ba7116b21fc2632 +Subproject commit 9fef7a1b762dfd8ad27190ebe31dd3afc784c6fa