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

Add pbkdf2 dependencies and fix the building errors

This commit is contained in:
Feng Lee 2017-03-13 13:30:49 +08:00
parent 90e46325df
commit 05396f0ade
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.config
View File

@ -1,4 +1,4 @@
{deps, [ {deps, [
{gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{esockd,".*",{git,"https://github.com/emqtt/esockd","master"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb",""}},{lager_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}} {gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{esockd,".*",{git,"https://github.com/emqtt/esockd","master"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb",""}},{lager_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}},{pbkdf2,".*",{git,"https://github.com/comtihon/erlang-pbkdf2.git","2.0.0"}}
]}. ]}.
{erl_opts, [{parse_transform,lager_transform}]}. {erl_opts, [{parse_transform,lager_transform}]}.

2
src/emqttd_client.erl
View File

@ -252,7 +252,7 @@ handle_info({keepalive, start, Interval}, State = #client_state{connection = Con
{error, Error} -> {error, Error} {error, Error} -> {error, Error}
end end
end, end,
case emqttd_keepalive:start(Statfun, Interval, {keepalive, check}) of case emqttd_keepalive:start(StatFun, Interval, {keepalive, check}) of
{ok, KeepAlive} -> {ok, KeepAlive} ->
{noreply, State#client_state{keepalive = KeepAlive}, hibernate}; {noreply, State#client_state{keepalive = KeepAlive}, hibernate};
{error, Error} -> {error, Error} ->

2
src/emqttd_ws_client.erl
View File

@ -202,7 +202,7 @@ handle_info({keepalive, start, Interval}, State = #wsclient_state{connection = C
{ok, KeepAlive} -> {ok, KeepAlive} ->
{noreply, State#wsclient_state{keepalive = KeepAlive}, hibernate}; {noreply, State#wsclient_state{keepalive = KeepAlive}, hibernate};
{error, Error} -> {error, Error} ->
?LOG(warning, "Keepalive error - ~p", [Error], State), ?WSLOG(warning, "Keepalive error - ~p", [Error], State),
shutdown(Error, State) shutdown(Error, State)
end; end;