Cache channel max bans value to save an O(n) loop of match() on every ban (etc) add

[user/henk/code/inspircd.git] / src / cmd_rehash.cpp

diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index f53f810a49544ef94acfb3c2611a999af804940a..d942255f350b6918fad7820abdd5955d932e9197 100644 (file)
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -30,6 +27,7 @@ CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
 {
        user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
        std::string parameter = "";
+       std::string old_disabled = ServerInstance->Config->DisabledCommands;
        if (pcnt)
        {
                parameter = parameters[0];
@@ -37,9 +35,18 @@ CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
        else
        {
                ServerInstance->WriteOpers("%s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
+               ServerInstance->CloseLog();
+               ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc);
+               ServerInstance->RehashUsersAndChans();
+               FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
                ServerInstance->Config->Read(false,user);
+               ServerInstance->Res->Rehash();
+               ServerInstance->ResetMaxBans();
        }
-       FOREACH_MOD(I_OnRehash,OnRehash(parameter));
+       if (old_disabled != ServerInstance->Config->DisabledCommands)
+               InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
+
+       FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
 
        return CMD_SUCCESS;
 }