From 6c7ea546cc3dea7bfa2eabfbe61426c1e0762dbf Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Mon, 2 May 2016 00:52:37 +0800 Subject: [PATCH 01/13] esockd 4.0 --- rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index fc6762faf..26a09ed74 100644 --- a/rebar.config +++ b/rebar.config @@ -41,7 +41,7 @@ {deps, [ {gproc, ".*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}}, {lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}}, - {esockd, "3.*", {git, "git://github.com/emqtt/esockd.git", {branch, "master"}}}, + {esockd, "*", {git, "git://github.com/emqtt/esockd.git", {branch, "master"}}}, {mochiweb, "4.*", {git, "git://github.com/emqtt/mochiweb.git", {branch, "master"}}} ]}. From f0e7c55d42f6f6e7f000fabd58b2c1019564551a Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Mon, 2 May 2016 00:53:21 +0800 Subject: [PATCH 02/13] .* --- rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index 26a09ed74..1ee966c4f 100644 --- a/rebar.config +++ b/rebar.config @@ -41,7 +41,7 @@ {deps, [ {gproc, ".*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}}, {lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}}, - {esockd, "*", {git, "git://github.com/emqtt/esockd.git", {branch, "master"}}}, + {esockd, ".*", {git, "git://github.com/emqtt/esockd.git", {branch, "master"}}}, {mochiweb, "4.*", {git, "git://github.com/emqtt/mochiweb.git", {branch, "master"}}} ]}. From 631609f0353cf8a590aad3548fedcfa4ac3503ad Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Mon, 2 May 2016 15:15:05 +0800 Subject: [PATCH 03/13] ensure gen_logger started --- rel/reltool.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rel/reltool.config b/rel/reltool.config index 1c0fc3356..411543559 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -21,7 +21,7 @@ compiler, runtime_tools, lager, - {gen_logger, load}, + gen_logger, gproc, esockd, mochiweb, From c2591494b6e7a59beb68f0605d20ba130144f809 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Tue, 3 May 2016 18:23:06 +0800 Subject: [PATCH 04/13] esockd .* --- rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index fc6762faf..1ee966c4f 100644 --- a/rebar.config +++ b/rebar.config @@ -41,7 +41,7 @@ {deps, [ {gproc, ".*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}}, {lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}}, - {esockd, "3.*", {git, "git://github.com/emqtt/esockd.git", {branch, "master"}}}, + {esockd, ".*", {git, "git://github.com/emqtt/esockd.git", {branch, "master"}}}, {mochiweb, "4.*", {git, "git://github.com/emqtt/mochiweb.git", {branch, "master"}}} ]}. From 9cf5e5cf2a2868319427c805d1d436404a5a2702 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Tue, 3 May 2016 18:29:05 +0800 Subject: [PATCH 05/13] vm([]) --- test/emqttd_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/emqttd_SUITE.erl b/test/emqttd_SUITE.erl index fc65e0477..ab5480aad 100644 --- a/test/emqttd_SUITE.erl +++ b/test/emqttd_SUITE.erl @@ -421,6 +421,6 @@ cli_listeners(_) -> emqttd_cli:listeners([]). cli_vm(_) -> - emqttd_cli:vm(), + emqttd_cli:vm([]), emqttd_cli:vm(["ports"]). From 76851e58fb7846e672e2ce373598e4a66ee61a65 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Tue, 3 May 2016 18:31:58 +0800 Subject: [PATCH 06/13] atom_to_list(Username) --- rel/files/emqttd.test.config | 2 +- src/emqttd_auth_username.erl | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rel/files/emqttd.test.config b/rel/files/emqttd.test.config index f837d07ac..c2b90993e 100644 --- a/rel/files/emqttd.test.config +++ b/rel/files/emqttd.test.config @@ -46,7 +46,7 @@ %% Authetication. Anonymous Default {auth, [ %% Authentication with username, password - %{username, []}, + {username, [{test, "password"}, {"test1", "password1"}]}, %% Authentication with clientid %{clientid, [{password, no}, {file, "etc/clients.config"}]}, diff --git a/src/emqttd_auth_username.erl b/src/emqttd_auth_username.erl index 155537a83..3bbae8abf 100644 --- a/src/emqttd_auth_username.erl +++ b/src/emqttd_auth_username.erl @@ -77,6 +77,9 @@ add_user(Username, Password) -> User = #?AUTH_USERNAME_TAB{username = Username, password = hash(Password)}, ret(mnesia:transaction(fun mnesia:write/1, [User])). +add_default_user(Username, Password) when is_atom(Username) -> + add_default_user(atom_to_list(Username), Password); + add_default_user(Username, Password) -> add_user(iolist_to_binary(Username), iolist_to_binary(Password)). From dae1cc1f813c5ab582ad9b1aeaeac2c1f362f388 Mon Sep 17 00:00:00 2001 From: Feng Date: Wed, 4 May 2016 01:02:00 +0800 Subject: [PATCH 07/13] 1.0.2 release --- docs/source/changes.rst | 16 +++++++++++++++- src/emqttd.app.src | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/source/changes.rst b/docs/source/changes.rst index 96f29fa03..309f65e13 100644 --- a/docs/source/changes.rst +++ b/docs/source/changes.rst @@ -5,7 +5,21 @@ Changes ======= -.. _release_1.0.1: +.. _release_1.0.2: + +------------- +Version 1.0.2 +------------- + +*Release Date: 2016-05-04* + +Issue#534 - './bin/emqttd_ctl vm' - add 'port/count', 'port/limit' statistics + +Issue#535 - emqttd_client should be terminated properly even if exception happened when sending data + +PR#519 - The erlang '-name' requires the fully qualified host name + +.. _release_l.0.1: ------------- Version 1.0.1 diff --git a/src/emqttd.app.src b/src/emqttd.app.src index 8e102ccc6..647c7d49d 100644 --- a/src/emqttd.app.src +++ b/src/emqttd.app.src @@ -1,7 +1,7 @@ {application, emqttd, [ {description, "Erlang MQTT Broker"}, - {vsn, "1.0.1"}, + {vsn, "1.0.2"}, {id, "emqttd"}, {modules, []}, {registered, []}, From a95f96a3218626c90d0a214512d16dff4fb49505 Mon Sep 17 00:00:00 2001 From: Feng Date: Wed, 4 May 2016 01:25:33 +0800 Subject: [PATCH 08/13] 1.0.2 - upgrade plugins --- docs/source/changes.rst | 2 ++ plugins/emqttd_dashboard | 2 +- plugins/emqttd_plugin_mysql | 2 +- plugins/emqttd_plugin_pgsql | 2 +- plugins/emqttd_plugin_redis | 2 +- plugins/emqttd_plugin_template | 2 +- plugins/emqttd_reloader | 2 +- plugins/emqttd_stomp | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/source/changes.rst b/docs/source/changes.rst index 309f65e13..bc16d60ce 100644 --- a/docs/source/changes.rst +++ b/docs/source/changes.rst @@ -19,6 +19,8 @@ Issue#535 - emqttd_client should be terminated properly even if exception happen PR#519 - The erlang '-name' requires the fully qualified host name +emqttd_reloader plugin - help reload modified modules during development. + .. _release_l.0.1: ------------- diff --git a/plugins/emqttd_dashboard b/plugins/emqttd_dashboard index 0a5983510..db9ed84da 160000 --- a/plugins/emqttd_dashboard +++ b/plugins/emqttd_dashboard @@ -1 +1 @@ -Subproject commit 0a59835106c7672699da7c2f9deb576678fdb37e +Subproject commit db9ed84da2c5f578f5762a6a69f715b7edafa02f diff --git a/plugins/emqttd_plugin_mysql b/plugins/emqttd_plugin_mysql index d714c7598..dfc35e696 160000 --- a/plugins/emqttd_plugin_mysql +++ b/plugins/emqttd_plugin_mysql @@ -1 +1 @@ -Subproject commit d714c759804f9528f187fadd544912e37fd664b0 +Subproject commit dfc35e6960a5ddbba8619cf92e72bf14dda4a54c diff --git a/plugins/emqttd_plugin_pgsql b/plugins/emqttd_plugin_pgsql index 81f0164a3..c81f66331 160000 --- a/plugins/emqttd_plugin_pgsql +++ b/plugins/emqttd_plugin_pgsql @@ -1 +1 @@ -Subproject commit 81f0164a339044d329c3179f922df332ae102696 +Subproject commit c81f663312ae371808fe10a5997ea78c3033eae7 diff --git a/plugins/emqttd_plugin_redis b/plugins/emqttd_plugin_redis index 9fef7a1b7..fa2b98ffa 160000 --- a/plugins/emqttd_plugin_redis +++ b/plugins/emqttd_plugin_redis @@ -1 +1 @@ -Subproject commit 9fef7a1b762dfd8ad27190ebe31dd3afc784c6fa +Subproject commit fa2b98ffa808242850fe118660ab77be3b6ea3ba diff --git a/plugins/emqttd_plugin_template b/plugins/emqttd_plugin_template index 6e1382b63..653e37d8e 160000 --- a/plugins/emqttd_plugin_template +++ b/plugins/emqttd_plugin_template @@ -1 +1 @@ -Subproject commit 6e1382b63096cc3259f7edc6c26adc571ee53d74 +Subproject commit 653e37d8e472b121c454fa2acd51f696ff144bd5 diff --git a/plugins/emqttd_reloader b/plugins/emqttd_reloader index d7ff2a70b..aaaa7c5d1 160000 --- a/plugins/emqttd_reloader +++ b/plugins/emqttd_reloader @@ -1 +1 @@ -Subproject commit d7ff2a70bc259432c9cf38e7c55781a474b4d2eb +Subproject commit aaaa7c5d11ffb681a79a264200602c5b7dc2dc1a diff --git a/plugins/emqttd_stomp b/plugins/emqttd_stomp index 745871d6a..39650c468 160000 --- a/plugins/emqttd_stomp +++ b/plugins/emqttd_stomp @@ -1 +1 @@ -Subproject commit 745871d6ae6f80de49dc4350772dd0f91d6a4408 +Subproject commit 39650c4685a38cecbdac785c3aafcd4c669aa301 From e57387a26c0de9d4f086a84f2ea47d0be0a4708e Mon Sep 17 00:00:00 2001 From: Feng Date: Wed, 4 May 2016 02:18:00 +0800 Subject: [PATCH 09/13] upgrade emqttd_reloader --- plugins/emqttd_reloader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/emqttd_reloader b/plugins/emqttd_reloader index aaaa7c5d1..fbe3d501d 160000 --- a/plugins/emqttd_reloader +++ b/plugins/emqttd_reloader @@ -1 +1 @@ -Subproject commit aaaa7c5d11ffb681a79a264200602c5b7dc2dc1a +Subproject commit fbe3d501dfedb69b9f4f91cb64afab244555f913 From f51c062d238d61f4a1a8ec7838891a67c05d4b64 Mon Sep 17 00:00:00 2001 From: Feng Date: Wed, 4 May 2016 02:36:04 +0800 Subject: [PATCH 10/13] upgrade emqttd_reloader --- plugins/emqttd_reloader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/emqttd_reloader b/plugins/emqttd_reloader index fbe3d501d..4577550a3 160000 --- a/plugins/emqttd_reloader +++ b/plugins/emqttd_reloader @@ -1 +1 @@ -Subproject commit fbe3d501dfedb69b9f4f91cb64afab244555f913 +Subproject commit 4577550a309dad9907205d9cb4fe1277d75ec142 From f6f6dfdb8dcec90d501cbaee724ab46259f7b8da Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Wed, 4 May 2016 15:55:08 +0800 Subject: [PATCH 11/13] merge master --- plugins/emqttd_dashboard | 2 +- plugins/emqttd_plugin_mysql | 2 +- plugins/emqttd_plugin_pgsql | 2 +- plugins/emqttd_plugin_redis | 2 +- plugins/emqttd_plugin_template | 2 +- plugins/emqttd_reloader | 2 +- plugins/emqttd_stomp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/emqttd_dashboard b/plugins/emqttd_dashboard index db9ed84da..0a5983510 160000 --- a/plugins/emqttd_dashboard +++ b/plugins/emqttd_dashboard @@ -1 +1 @@ -Subproject commit db9ed84da2c5f578f5762a6a69f715b7edafa02f +Subproject commit 0a59835106c7672699da7c2f9deb576678fdb37e diff --git a/plugins/emqttd_plugin_mysql b/plugins/emqttd_plugin_mysql index dfc35e696..d714c7598 160000 --- a/plugins/emqttd_plugin_mysql +++ b/plugins/emqttd_plugin_mysql @@ -1 +1 @@ -Subproject commit dfc35e6960a5ddbba8619cf92e72bf14dda4a54c +Subproject commit d714c759804f9528f187fadd544912e37fd664b0 diff --git a/plugins/emqttd_plugin_pgsql b/plugins/emqttd_plugin_pgsql index c81f66331..81f0164a3 160000 --- a/plugins/emqttd_plugin_pgsql +++ b/plugins/emqttd_plugin_pgsql @@ -1 +1 @@ -Subproject commit c81f663312ae371808fe10a5997ea78c3033eae7 +Subproject commit 81f0164a339044d329c3179f922df332ae102696 diff --git a/plugins/emqttd_plugin_redis b/plugins/emqttd_plugin_redis index fa2b98ffa..9fef7a1b7 160000 --- a/plugins/emqttd_plugin_redis +++ b/plugins/emqttd_plugin_redis @@ -1 +1 @@ -Subproject commit fa2b98ffa808242850fe118660ab77be3b6ea3ba +Subproject commit 9fef7a1b762dfd8ad27190ebe31dd3afc784c6fa diff --git a/plugins/emqttd_plugin_template b/plugins/emqttd_plugin_template index 653e37d8e..6e1382b63 160000 --- a/plugins/emqttd_plugin_template +++ b/plugins/emqttd_plugin_template @@ -1 +1 @@ -Subproject commit 653e37d8e472b121c454fa2acd51f696ff144bd5 +Subproject commit 6e1382b63096cc3259f7edc6c26adc571ee53d74 diff --git a/plugins/emqttd_reloader b/plugins/emqttd_reloader index 4577550a3..d7ff2a70b 160000 --- a/plugins/emqttd_reloader +++ b/plugins/emqttd_reloader @@ -1 +1 @@ -Subproject commit 4577550a309dad9907205d9cb4fe1277d75ec142 +Subproject commit d7ff2a70bc259432c9cf38e7c55781a474b4d2eb diff --git a/plugins/emqttd_stomp b/plugins/emqttd_stomp index 39650c468..745871d6a 160000 --- a/plugins/emqttd_stomp +++ b/plugins/emqttd_stomp @@ -1 +1 @@ -Subproject commit 39650c4685a38cecbdac785c3aafcd4c669aa301 +Subproject commit 745871d6ae6f80de49dc4350772dd0f91d6a4408 From f50efa5813ce087b19ac8e3edcbd92e0e832578f Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Thu, 5 May 2016 15:36:44 +0800 Subject: [PATCH 12/13] fix issue#542 --- src/emqttd_access_control.erl | 4 ++-- test/emqttd_access_SUITE.erl | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/emqttd_access_control.erl b/src/emqttd_access_control.erl index 8fa96a81f..6888afb0d 100644 --- a/src/emqttd_access_control.erl +++ b/src/emqttd_access_control.erl @@ -89,7 +89,7 @@ check_acl(Client, PubSub, Topic, [{Mod, State, _Seq}|AclMods]) -> end. %% @doc Reload ACL Rules. --spec(reload_acl() -> list(ok | {error, any()})). +-spec(reload_acl() -> list(ok | {error, alread_existed})). reload_acl() -> [Mod:reload_acl(State) || {Mod, State, _Seq} <- lookup_mods(acl)]. @@ -201,5 +201,5 @@ mod(Prefix, Name) -> list_to_atom(lists:concat([Prefix, Name])). if_existed(false, Fun) -> Fun(); -if_existed(true, _Fun) -> {error, existed}. +if_existed(_Mod, _Fun) -> {error, alread_existed}. diff --git a/test/emqttd_access_SUITE.erl b/test/emqttd_access_SUITE.erl index c12fd00bd..70fe12e20 100644 --- a/test/emqttd_access_SUITE.erl +++ b/test/emqttd_access_SUITE.erl @@ -78,6 +78,7 @@ reload_acl(_) -> register_mod(_) -> ok = ?AC:register_mod(acl, emqttd_acl_test_mod, []), + {error, alread_existed} = ?AC:register_mod(acl, emqttd_acl_test_mod, []), [{emqttd_acl_test_mod, _, 0}, {emqttd_acl_internal, _, 0}] = ?AC:lookup_mods(acl), ok = ?AC:register_mod(auth, emqttd_auth_anonymous_test_mod,[]), From 6245d24c83e045553b0bfce7932142472bd6cdfb Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Thu, 5 May 2016 15:44:36 +0800 Subject: [PATCH 13/13] {error, already_existed} --- src/emqttd_access_control.erl | 4 ++-- test/emqttd_access_SUITE.erl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/emqttd_access_control.erl b/src/emqttd_access_control.erl index 6888afb0d..47d6417d4 100644 --- a/src/emqttd_access_control.erl +++ b/src/emqttd_access_control.erl @@ -89,7 +89,7 @@ check_acl(Client, PubSub, Topic, [{Mod, State, _Seq}|AclMods]) -> end. %% @doc Reload ACL Rules. --spec(reload_acl() -> list(ok | {error, alread_existed})). +-spec(reload_acl() -> list(ok | {error, already_existed})). reload_acl() -> [Mod:reload_acl(State) || {Mod, State, _Seq} <- lookup_mods(acl)]. @@ -201,5 +201,5 @@ mod(Prefix, Name) -> list_to_atom(lists:concat([Prefix, Name])). if_existed(false, Fun) -> Fun(); -if_existed(_Mod, _Fun) -> {error, alread_existed}. +if_existed(_Mod, _Fun) -> {error, already_existed}. diff --git a/test/emqttd_access_SUITE.erl b/test/emqttd_access_SUITE.erl index 70fe12e20..1aa153b96 100644 --- a/test/emqttd_access_SUITE.erl +++ b/test/emqttd_access_SUITE.erl @@ -78,7 +78,7 @@ reload_acl(_) -> register_mod(_) -> ok = ?AC:register_mod(acl, emqttd_acl_test_mod, []), - {error, alread_existed} = ?AC:register_mod(acl, emqttd_acl_test_mod, []), + {error, already_existed} = ?AC:register_mod(acl, emqttd_acl_test_mod, []), [{emqttd_acl_test_mod, _, 0}, {emqttd_acl_internal, _, 0}] = ?AC:lookup_mods(acl), ok = ?AC:register_mod(auth, emqttd_auth_anonymous_test_mod,[]),