* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
return new CommandRehash(Instance);
}
-CmdResult CommandRehash::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, User *user)
{
- user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
- std::string parameter;
std::string old_disabled = ServerInstance->Config->DisabledCommands;
- if (pcnt)
+
+ if (parameters.size() && parameters[0][0] != '-')
{
- parameter = parameters[0];
+ if (!InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0]))
+ {
+ FOREACH_MOD(I_OnRehash,OnRehash(user, parameters[0]));
+ return CMD_SUCCESS; // rehash for a server, and not for us
+ }
}
- else
+ else if (parameters.size())
{
- ServerInstance->WriteOpers("*** %s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
- ServerInstance->CloseLog();
- if (!ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc))
- user->WriteServ("*** NOTICE %s :ERROR: Could not open logfile %s: %s", user->nick, ServerInstance->Config->logpath.c_str(), strerror(errno));
- ServerInstance->RehashUsersAndChans();
- FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
- /*ServerInstance->Config->Read(false,user);*/
- // Get XLine to do it's thing.
- ServerInstance->XLines->CheckELines();
- ServerInstance->XLines->ApplyLines();
- ServerInstance->Res->Rehash();
- ServerInstance->ResetMaxBans();
+ FOREACH_MOD(I_OnRehash,OnRehash(user, parameters[0]));
+ return CMD_SUCCESS;
}
- if (old_disabled != ServerInstance->Config->DisabledCommands)
- InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
- FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
+ // Rehash for me.
+ FOREACH_MOD(I_OnRehash,OnRehash(user, ""));
+
+ if (IS_LOCAL(user))
+ user->WriteNumeric(RPL_REHASHING, "%s %s :Rehashing",user->nick.c_str(),ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
+ else
+ ServerInstance->PI->SendUserNotice(user, std::string("*** Rehashing server ") + ServerInstance->ConfigFileName);
+
+
+ std::string m = user->nick + " is rehashing config file " + ServerConfig::CleanFilename(ServerInstance->ConfigFileName) + " on " + ServerInstance->Config->ServerName;
+ ServerInstance->SNO->WriteToSnoMask('a', m);
+
+ /* Don't do anything with the logs here -- logs are restarted
+ * after the config thread has completed.
+ */
+
+ ServerInstance->RehashUsersAndChans();
+ FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
- ServerInstance->BuildISupport();
+ if (!ServerInstance->ConfigThread)
+ {
+ ServerInstance->Config->RehashUserUID = user->uuid;
+ ServerInstance->Config->RehashParameter = parameters.size() ? parameters[0] : "";
+
+ ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, false, ServerInstance->Config->RehashUserUID);
+ ServerInstance->Threads->Start(ServerInstance->ConfigThread);
+ }
+ else
+ {
+ /*
+ * A rehash is already in progress! ahh shit.
+ * 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());
+ else
+ ServerInstance->PI->SendUserNotice(user, "*** Could not rehash: A rehash is already in progress.");
+
+ return CMD_FAILURE;
+ }
return CMD_SUCCESS;
}