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

Merge branch 'emq20' of https://github.com/emqtt/emqttd into emq20

This commit is contained in:
turtled 2016-12-05 15:00:22 +08:00
parent 0206785577 198fe84d91
commit c59f43cdd2
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -1,9 +1,8 @@
PROJECT = emqttd PROJECT = emqttd
PROJECT_DESCRIPTION = Erlang MQTT Broker PROJECT_DESCRIPTION = Erlang MQTT Broker
PROJECT_VERSION = 2.0.1 PROJECT_VERSION = 2.0.2
DEPS = gproc lager gen_logger esockd mochiweb DEPS = gproc lager gen_logger esockd mochiweb
## getopt pbkdf2 clique time_compat rand_compat
dep_gproc = git https://github.com/uwiger/gproc dep_gproc = git https://github.com/uwiger/gproc
dep_getopt = git https://github.com/jcomellas/getopt v0.8.2 dep_getopt = git https://github.com/jcomellas/getopt v0.8.2
@ -11,10 +10,6 @@ dep_lager = git https://github.com/basho/lager master
dep_gen_logger = git https://github.com/emqtt/gen_logger dep_gen_logger = git https://github.com/emqtt/gen_logger
dep_esockd = git https://github.com/emqtt/esockd master dep_esockd = git https://github.com/emqtt/esockd master
dep_mochiweb = git https://github.com/emqtt/mochiweb dep_mochiweb = git https://github.com/emqtt/mochiweb
#dep_clique = git https://github.com/basho/clique
#dep_pbkdf2 = git https://github.com/basho/erlang-pbkdf2 2.0.0
#dep_time_compat = git https://github.com/lasp-lang/time_compat
#dep_rand_compat = git https://github.com/lasp-lang/rand_compat
TEST_DEPS = cuttlefish TEST_DEPS = cuttlefish
dep_cuttlefish = git https://github.com/emqtt/cuttlefish dep_cuttlefish = git https://github.com/emqtt/cuttlefish

4
src/emqttd_session.erl
View File

@ -336,12 +336,10 @@ handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client
?LOG(warning, "destroyed", [], Session), ?LOG(warning, "destroyed", [], Session),
shutdown(destroy, Session); shutdown(destroy, Session);
%%
handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client_pid = OldClientPid}) -> handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client_pid = OldClientPid}) ->
?LOG(warning, "kicked out~p", [OldClientPid], Session), ?LOG(warning, "kickout ~p", [OldClientPid], Session),
shutdown(conflict, Session); shutdown(conflict, Session);
handle_cast({resume, ClientId, ClientPid}, Session = #session{client_id = ClientId, handle_cast({resume, ClientId, ClientPid}, Session = #session{client_id = ClientId,
client_pid = OldClientPid, client_pid = OldClientPid,
clean_sess = CleanSess, clean_sess = CleanSess,