X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_rehash.cpp;h=5d5caa32abd216d6ad1f59b550066a844a747764;hb=9aa6c07d92fb9c1132f06b8c5781d77ee7086edb;hp=85df9193076c69b79e17b58228e069b7b2f41715;hpb=f7df5c69c4c54ebac32b1f3af3381495bef2cbd5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index 85df91930..5d5caa32a 100644
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -2,8 +2,8 @@
  *       | 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.
@@ -13,63 +13,97 @@
 
 #include "inspircd.h"
 #include "xline.h"
-#include "commands/cmd_rehash.h"
-
-
-
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /REHASH. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandRehash : public Command
 {
-	return new CommandRehash(Instance);
-}
+ public:
+	/** Constructor for rehash.
+	 */
+	CommandRehash ( Module* parent) : Command(parent,"REHASH",0) { flags_needed = 'o'; Penalty = 2; syntax = "[<servermask>]"; }
+	/** Handle command.
+	 * @param parameters The parameters to the comamnd
+	 * @param pcnt The number of parameters passed to teh command
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
-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)
+	std::string param = parameters.size() ? parameters[0] : "";
+
+	FOREACH_MOD(I_OnPreRehash,OnPreRehash(user, param));
+
+	if (param.empty())
 	{
-		parameter = parameters[0];
+		// standard rehash of local server
 	}
-	else
+	else if (param.find_first_of("*.") != std::string::npos)
 	{
-		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)
+		// rehash of servers by server name (with wildcard)
+		if (!InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0]))
 		{
-			ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance);
-			ServerInstance->Threads->Create(ServerInstance->ConfigThread);
+			// Doesn't match us. PreRehash is already done, nothing left to do
+			return CMD_SUCCESS;
 		}
+	}
+	else
+	{
+		// parameterized rehash
+
+		// the leading "-" is optional; remove it if present.
+		if (param[0] == '-')
+			param = param.substr(1);
+
+		FOREACH_MOD(I_OnModuleRehash,OnModuleRehash(user, param));
+		return CMD_SUCCESS;
+	}
+
+	// Rehash for me. Try to start the rehash thread
+	if (!ServerInstance->ConfigThread)
+	{
+		std::string m = user->nick + " is rehashing config file " + ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()) + " on " + ServerInstance->Config->ServerName;
+		ServerInstance->SNO->WriteGlobalSno('a', m);
+
+		if (IS_LOCAL(user))
+			user->WriteNumeric(RPL_REHASHING, "%s %s :Rehashing",
+				user->nick.c_str(),ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()));
 		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
+			ServerInstance->PI->SendUserNotice(user, std::string("*** Rehashing server ") +
+				ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()));
+
+		/* Don't do anything with the logs here -- logs are restarted
+		 * after the config thread has completed.
 		 */
-		// Get XLine to do it's thing.
-		/*ServerInstance->XLines->CheckELines();
-		ServerInstance->XLines->ApplyLines();
-		ServerInstance->Res->Rehash();
-		ServerInstance->ResetMaxBans();*/
-	}
 
-	/* 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());
+
 
-	FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
+		ServerInstance->ConfigThread = new ConfigReaderThread(user->uuid);
+		ServerInstance->Threads->Start(ServerInstance->ConfigThread);
 
-	ServerInstance->BuildISupport();
+		return CMD_SUCCESS;
+	}
+	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_SUCCESS;
+		return CMD_FAILURE;
+	}
 }
 
+
+COMMAND_INIT(CommandRehash)