X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_rehash.cpp;h=ebbb7c9bd7d1a8ec5619684441985f8bb10e900b;hb=b0546ed55e040330dd28a856d6fab2e55863dd1f;hp=7fdb9862ed9101c534549b35354b7f66e2d8e7f2;hpb=b119a88b55e7f5f3260ff21e78a5c9d1cf491cc8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index 7fdb9862e..ebbb7c9bd 100644
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -22,53 +22,67 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	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)
+
+	if (parameters.size() && parameters[0][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 if (parameters.size())
 	{
-		parameter = parameters[0];
+		FOREACH_MOD(I_OnRehash,OnRehash(user, parameters[0]));
+		return CMD_SUCCESS;
 	}
+
+	// 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);
+	ServerInstance->Logs->CloseLogs();
+
+	if (!ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc))
 	{
-		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
-		{
-			/* 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;
-		}
-		/* 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();*/
+		m = std::string("ERROR: Could not open logfile ") + ServerInstance->Config->logpath + ":" + strerror(errno);
+		ServerInstance->SNO->WriteToSnoMask('A', m);
 	}
 
-	/* TODO: Same as above for all this stuff, really */
-	if (old_disabled != ServerInstance->Config->DisabledCommands)
-		InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
+	ServerInstance->RehashUsersAndChans();
+	FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
+
+	if (!ServerInstance->ConfigThread)
+	{
+		ServerInstance->Config->RehashUserUID = user->uuid;
+		ServerInstance->Config->RehashParameter = parameters.size() ? parameters[0] : "";
 
-	FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
+		ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, false, ServerInstance->Config->RehashUserUID);
+		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;
 }