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

start acl

This commit is contained in:
Ery Lee 2015-04-06 12:00:26 +08:00
parent 18f18fc1a1
commit 088aa5c804
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqttd/src/emqttd_acl_internal.erl
View File

@ -125,9 +125,11 @@ description() ->
%%%============================================================================= %%%=============================================================================
init([AclOpts]) -> init([AclOpts]) ->
ets:new(?ACL_RULE_TABLE, [set, proteted, named_table]), ets:new(?ACL_RULE_TABLE, [set, protected, named_table]),
AclFile = proplists:get_value(file, AclOpts), AclFile = proplists:get_value(file, AclOpts),
load_rules(#state{acl_file = AclFile}). {ok, State} = load_rules(#state{acl_file = AclFile}),
emqttd_acl:register_mod(?MODULE),
{ok, State}.
handle_call(reload, _From, State) -> handle_call(reload, _From, State) ->
case catch load_rules(State) of case catch load_rules(State) of

3
apps/emqttd/src/emqttd_app.erl
View File

@ -81,6 +81,7 @@ start_servers(Sup) ->
{ok, RetainOpts} = application:get_env(retain), {ok, RetainOpts} = application:get_env(retain),
{ok, BrokerOpts} = application:get_env(broker), {ok, BrokerOpts} = application:get_env(broker),
{ok, MetricOpts} = application:get_env(metrics), {ok, MetricOpts} = application:get_env(metrics),
{ok, AclOpts} = application:get_env(acl),
lists:foreach( lists:foreach(
fun({Name, F}) when is_function(F) -> fun({Name, F}) when is_function(F) ->
?PRINT("~s is starting...", [Name]), ?PRINT("~s is starting...", [Name]),
@ -107,6 +108,8 @@ start_servers(Sup) ->
{"emqttd broker", emqttd_broker, BrokerOpts}, {"emqttd broker", emqttd_broker, BrokerOpts},
{"emqttd metrics", emqttd_metrics, MetricOpts}, {"emqttd metrics", emqttd_metrics, MetricOpts},
{"emqttd bridge supervisor", {supervisor, emqttd_bridge_sup}}, {"emqttd bridge supervisor", {supervisor, emqttd_bridge_sup}},
{"emqttd acl", emqttd_acl, AclOpts},
{"emqttd internal acl", emqttd_acl_internal, AclOpts},
{"emqttd monitor", emqttd_monitor} {"emqttd monitor", emqttd_monitor}
]). ]).