From d62593a9c66fd4e15b5767957f93eec4fc8de5e5 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 2 Dec 2016 09:17:06 +0800 Subject: [PATCH 1/3] kickout --- src/emqttd_session.erl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/emqttd_session.erl b/src/emqttd_session.erl index 99de19d50..2313cadb7 100644 --- a/src/emqttd_session.erl +++ b/src/emqttd_session.erl @@ -336,12 +336,10 @@ handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client ?LOG(warning, "destroyed", [], Session), shutdown(destroy, Session); -%% 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); - handle_cast({resume, ClientId, ClientPid}, Session = #session{client_id = ClientId, client_pid = OldClientPid, clean_sess = CleanSess, From 03e2e7b8398734e103ac0e0288163b3080801de7 Mon Sep 17 00:00:00 2001 From: Feng Date: Sun, 4 Dec 2016 14:23:46 +0800 Subject: [PATCH 2/3] 2.0.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a2248cc59..d266170d9 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PROJECT = emqttd PROJECT_DESCRIPTION = Erlang MQTT Broker -PROJECT_VERSION = 2.0.1 +PROJECT_VERSION = 2.0.2 DEPS = gproc lager gen_logger esockd mochiweb ## getopt pbkdf2 clique time_compat rand_compat From 198fe84d91e6523ac911d3eb1baff8747ff4aa7b Mon Sep 17 00:00:00 2001 From: Feng Date: Sun, 4 Dec 2016 14:31:14 +0800 Subject: [PATCH 3/3] clean deps --- Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile index d266170d9..e8cf540a3 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ PROJECT_DESCRIPTION = Erlang MQTT Broker PROJECT_VERSION = 2.0.2 DEPS = gproc lager gen_logger esockd mochiweb -## getopt pbkdf2 clique time_compat rand_compat dep_gproc = git https://github.com/uwiger/gproc 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_esockd = git https://github.com/emqtt/esockd master 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 dep_cuttlefish = git https://github.com/emqtt/cuttlefish