Change the syntax of FOREACH macros to be less dumb.

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

diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index 1fa6e5731b8c730c07c7ac372c6ef83dee3d14c6..3dc45403609571821bd070dadd9f7965f74c1f37 100644 (file)
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -45,7 +45,7 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
 {
        std::string param = parameters.size() ? parameters[0] : "";
 
-       FOREACH_MOD(I_OnPreRehash,OnPreRehash(user, param));
+       FOREACH_MOD(OnPreRehash, (user, param));
 
        if (param.empty())
        {
@@ -68,7 +68,7 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
                if (param[0] == '-')
                        param = param.substr(1);
 
-               FOREACH_MOD(I_OnModuleRehash,OnModuleRehash(user, param));
+               FOREACH_MOD(OnModuleRehash, (user, param));
                return CMD_SUCCESS;
        }
 
@@ -88,14 +88,11 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
                /* Don't do anything with the logs here -- logs are restarted
                 * after the config thread has completed.
                 */
-               ServerInstance->RehashUsersAndChans();
-               FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
+               FOREACH_MOD(OnGarbageCollect, ());
 
 
                ServerInstance->ConfigThread = new ConfigReaderThread(user->uuid);
                ServerInstance->Threads->Start(ServerInstance->ConfigThread);
-
-               return CMD_SUCCESS;
        }
        else
        {
@@ -104,12 +101,13 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
                 * XXX, todo: we should find some way to kill runaway rehashes that are blocking, this is a major problem for unrealircd users
                 */
                if (IS_LOCAL(user))
-                       user->WriteServ("NOTICE %s :*** Could not rehash: A rehash is already in progress.", user->nick.c_str());
+                       user->WriteNotice("*** Could not rehash: A rehash is already in progress.");
                else
                        ServerInstance->PI->SendUserNotice(user, "*** Could not rehash: A rehash is already in progress.");
-
-               return CMD_FAILURE;
        }
+
+       // Always return success so spanningtree forwards an incoming REHASH even if we failed
+       return CMD_SUCCESS;
 }