From f50efa5813ce087b19ac8e3edcbd92e0e832578f Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Thu, 5 May 2016 15:36:44 +0800 Subject: [PATCH] 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,[]),