Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

Merge pull request #2188 from weiss/fix-acl-reload

Browse Source 
Forget old access/shaper rules and ACLs on reload
This commit is contained in:
Evgeny Khramtsov 2017-12-27 09:34:19 +03:00 committed by GitHub
commit bbb1f7002d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/acl.erl
View File

@ -32,9 +32,9 @@
-export([add_access/3, clear/0]). -export([add_access/3, clear/0]).
-export([start_link/0, add/3, add_list/3, add_local/3, add_list_local/3, -export([start_link/0, add/3, add_list/3, add_local/3, add_list_local/3,
load_from_config/0, match_rule/3, any_rules_allowed/3, load_from_config/0, reload_from_config/0, match_rule/3,
transform_options/1, opt_type/1, acl_rule_matches/3, any_rules_allowed/3, transform_options/1, opt_type/1,
acl_rule_verify/1, access_matches/3, acl_rule_matches/3, acl_rule_verify/1, access_matches/3,
transform_access_rules_config/1, transform_access_rules_config/1,
parse_ip_netmask/1, parse_ip_netmask/1,
access_rules_validator/1, shaper_rules_validator/1, access_rules_validator/1, shaper_rules_validator/1,
@ -92,7 +92,7 @@ init([]) ->
[{ram_copies, [node()]}, [{ram_copies, [node()]},
{local_content, true}, {local_content, true},
{attributes, record_info(fields, access)}]), {attributes, record_info(fields, access)}]),
ejabberd_hooks:add(config_reloaded, ?MODULE, load_from_config, 20), ejabberd_hooks:add(config_reloaded, ?MODULE, reload_from_config, 20),
load_from_config(), load_from_config(),
{ok, #state{}}. {ok, #state{}}.
@ -236,6 +236,12 @@ load_from_config() ->
end, ShaperRules) end, ShaperRules)
end, Hosts). end, Hosts).
-spec reload_from_config() -> ok.
reload_from_config() ->
clear(),
load_from_config().
%% Delete all previous set ACLs and Access rules %% Delete all previous set ACLs and Access rules
clear() -> clear() ->
mnesia:clear_table(acl), mnesia:clear_table(acl),