From dc2e6ab53c65b8507c9eac0c292054eb0f17344c Mon Sep 17 00:00:00 2001 From: turtled Date: Fri, 26 May 2017 12:31:07 +0800 Subject: [PATCH 1/2] Hash type add bcrypt --- src/emqttd_auth_mod.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emqttd_auth_mod.erl b/src/emqttd_auth_mod.erl index 14e4468e3..c94578c46 100644 --- a/src/emqttd_auth_mod.erl +++ b/src/emqttd_auth_mod.erl @@ -22,7 +22,7 @@ -export([passwd_hash/2]). --type(hash_type() :: plain | md5 | sha | sha256 | pbkdf2). +-type(hash_type() :: plain | md5 | sha | sha256 | pbkdf2 | bcrypt). %%-------------------------------------------------------------------- %% Authentication behavihour From 0f7a66f810b2b7158e8a451f2fc5af6cbe30d76d Mon Sep 17 00:00:00 2001 From: turtled Date: Fri, 26 May 2017 16:44:44 +0800 Subject: [PATCH 2/2] Force gc call emit_stats --- src/emqttd_client.erl | 2 +- src/emqttd_ws_client.erl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/emqttd_client.erl b/src/emqttd_client.erl index 98db870e7..dedfcf1df 100644 --- a/src/emqttd_client.erl +++ b/src/emqttd_client.erl @@ -382,6 +382,6 @@ stop(Reason, State) -> {stop, Reason, State}. gc(State = #client_state{connection = Conn}) -> - Cb = fun() -> Conn:gc() end, + Cb = fun() -> Conn:gc(), emit_stats(State) end, emqttd_gc:maybe_force_gc(#client_state.force_gc_count, State, Cb). diff --git a/src/emqttd_ws_client.erl b/src/emqttd_ws_client.erl index d9795be37..2433b2ea8 100644 --- a/src/emqttd_ws_client.erl +++ b/src/emqttd_ws_client.erl @@ -300,5 +300,6 @@ stop(Reason, State) -> {stop, Reason, State}. gc(State) -> - emqttd_gc:maybe_force_gc(#wsclient_state.force_gc_count, State). + Cb = fun() -> emit_stats(State) end, + emqttd_gc:maybe_force_gc(#wsclient_state.force_gc_count, State, Cb).