return new CommandRehash(Instance);
}
-CmdResult CommandRehash::Handle (const char* const* 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)
- {
- parameter = parameters[0];
- }
- else
+
+ if (parameters.size() && parameters[0][0] != '-')
{
- ServerInstance->SNO->WriteToSnoMask('A', "%s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
- ServerInstance->Logs->CloseLogs();
- 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());
- if (!ServerInstance->ConfigThread)
- {
- ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, false, user);
- ServerInstance->Threads->Create(ServerInstance->ConfigThread);
- }
- else
+ if (!ServerInstance->MatchText(ServerInstance->Config->ServerName, parameters[0]))
{
- /* A rehash is already in progress! ahh shit. */
- user->WriteServ("*** NOTICE %s :*** Could not rehash: A rehash is already in progress.", user->nick);
- return CMD_FAILURE;
+ FOREACH_MOD(I_OnRehash,OnRehash(user, parameters[0]));
+ return CMD_SUCCESS; // rehash for a server, and not for us
}
- /* TODO:
- * ALL THIS STUFF HERE NEEDS TO BE HOOKED TO THE 'DEATH' OF THE REHASH THREAD
- * VIA SOME NOTIFICATION EVENT. WE CANT JUST CALL IT ALL HERE.
- * -- B
- */
- // Get XLine to do it's thing.
- /*ServerInstance->XLines->CheckELines();
- ServerInstance->XLines->ApplyLines();
- ServerInstance->Res->Rehash();
- ServerInstance->ResetMaxBans();*/
}
+ else if (parameters.size())
+ {
+ FOREACH_MOD(I_OnRehash,OnRehash(user, parameters[0]));
+ return CMD_SUCCESS;
+ }
+
+ // Rehash for me.
+ FOREACH_MOD(I_OnRehash,OnRehash(user, ""));
+
+ // XXX write this to a remote user correctly
+ user->WriteNumeric(RPL_REHASHING, "%s %s :Rehashing",user->nick.c_str(),ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
+
+ std::string m = user->nick + " is rehashing config file " + ServerConfig::CleanFilename(ServerInstance->ConfigFileName) + " on " + ServerInstance->Config->ServerName;
+ ServerInstance->SNO->WriteToSnoMask('A', m);
+ ServerInstance->Logs->CloseLogs();
+
+ if (!ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc))
+ {
+ m = std::string("ERROR: Could not open logfile ") + ServerInstance->Config->logpath + ":" + strerror(errno);
+ ServerInstance->SNO->WriteToSnoMask('A', m);
+ }
+
+ ServerInstance->RehashUsersAndChans();
+ FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
- /* TODO: Same as above for all this stuff, really */
- if (old_disabled != ServerInstance->Config->DisabledCommands)
- InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
+ if (!ServerInstance->ConfigThread)
+ {
+ ServerInstance->Config->RehashUser = user;
+ ServerInstance->Config->RehashParameter = parameters.size() ? parameters[0] : "";
- FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
+ ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, false, user);
+ ServerInstance->Threads->Create(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.");
- ServerInstance->BuildISupport();
+ return CMD_FAILURE;
+ }
return CMD_SUCCESS;
}