From a3ea6e77231db444524e81d654051a94cdccde7d Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Thu, 23 Feb 2017 11:14:49 +0300
Subject: [PATCH] Improve reload_config admin command

---
 src/ejabberd_admin.erl | 6 +++---
 src/shaper.erl         | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 67778e71c..b3583c946 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -174,7 +174,7 @@ get_commands_spec() ->
 			args = [],
 			result = {vhosts, {list, {vhost, string}}}},
      #ejabberd_commands{name = reload_config, tags = [server],
-			desc = "Reload config file in memory (only affects ACL and Access)",
+			desc = "Reload config file in memory",
 			module = ?MODULE, function = reload_config,
 			args = [],
 			result = {res, rescode}},
@@ -473,8 +473,8 @@ registered_vhosts() ->
 
 reload_config() ->
     ejabberd_config:reload_file(),
-    acl:load_from_config(),
-    shaper:load_from_config(),
+    %% TODO: Move this to ejabberd_access_permissions.erl and put on hook
+    %% This requires ejabberd_access_permissions to start after ejabberd_hooks
     ejabberd_access_permissions:invalidate().
 
 %%%
diff --git a/src/shaper.erl b/src/shaper.erl
index 9ce3f5b6f..a2f76b1c4 100644
--- a/src/shaper.erl
+++ b/src/shaper.erl
@@ -55,6 +55,7 @@ start() ->
                          {local_content, true},
 			 {attributes, record_info(fields, shaper)}]),
     mnesia:add_table_copy(shaper, node(), ram_copies),
+    ejabberd_hooks:add(config_reloaded, ?MODULE, load_from_config, 20),
     load_from_config(),
     ok.