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

Merge pull request #1072 from emqtt/emq22 

Version 2.2-beta.3
This commit is contained in:
Feng Lee 2017-05-26 21:00:16 +08:00 committed by GitHub
parent fbe4ee4eed fa10394f37
commit bc2bd62c4a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqttd_auth_mod.erl
View File

@ -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

2
src/emqttd_client.erl
View File

@ -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).

3
src/emqttd_ws_client.erl
View File

@ -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).