X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_rehash.cpp;h=60b1e12b640d126fe15cf565315a9396e94e10db;hb=91df762e93212958db487d8517addba1a63a4ddd;hp=0f60f4a6df8abf5d8e506b713916656060868220;hpb=9954ce7e652fdf1bef963b3a133724e8a8eb4cad;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp index 0f60f4a6d..60b1e12b6 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,74 +13,122 @@ #include "inspircd.h" #include "xline.h" -#include "commands/cmd_rehash.h" +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * 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. + * + * --------------------------------------------------- + */ + +#ifndef __CMD_REHASH_H__ +#define __CMD_REHASH_H__ +// include the common header files +#include "users.h" +#include "channels.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 (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"REHASH","o",0,false,3) { syntax = "[]"; } + /** 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& parameters, User *user); +}; -CmdResult CommandRehash::Handle (const char* const* parameters, int pcnt, User *user) +#endif + + + +CmdResult CommandRehash::Handle (const std::vector& parameters, User *user) { - std::string old_disabled = ServerInstance->Config->DisabledCommands; + std::string param = parameters.size() ? parameters[0] : ""; + + FOREACH_MOD(I_OnPreRehash,OnPreRehash(user, param)); - ServerInstance->Logs->Log("fuckingrehash", DEBUG, "parc %d p0 %s", pcnt, parameters[0]); - if (pcnt && parameters[0][0] != '-') + if (param.empty()) { - if (!ServerInstance->MatchText(ServerInstance->Config->ServerName, parameters[0])) + // standard rehash of local server + } + else if (param.find_first_of("*.") != std::string::npos) + { + // rehash of servers by server name (with wildcard) + if (!InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0])) { - ServerInstance->Logs->Log("fuckingrehash", DEBUG, "rehash for a server, and not for us"); - FOREACH_MOD(I_OnRehash,OnRehash(user, parameters[0])); - return CMD_SUCCESS; // rehash for a server, and not for us + // Doesn't match us. PreRehash is already done, nothing left to do + return CMD_SUCCESS; } } - else if (pcnt) + else { - ServerInstance->Logs->Log("fuckingrehash", DEBUG, "rehash for a subsystem, ignoring"); - FOREACH_MOD(I_OnRehash,OnRehash(user, parameters[0])); + // 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. - FOREACH_MOD(I_OnRehash,OnRehash(user, "")); + // 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) + " on " + ServerInstance->Config->ServerName; + ServerInstance->SNO->WriteGlobalSno('a', m); - // XXX write this to a remote user correctly - user->WriteNumeric(382, "%s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName)); + 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 ") + + ServerConfig::CleanFilename(ServerInstance->ConfigFileName)); - std::string m = std::string(user->nick) + " is rehashing config file " + ServerConfig::CleanFilename(ServerInstance->ConfigFileName) + " on " + ServerInstance->Config->ServerName; - ServerInstance->SNO->WriteToSnoMask('A', m); - ServerInstance->Logs->CloseLogs(); + /* Don't do anything with the logs here -- logs are restarted + * after the config thread has completed. + */ - 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()); - ServerInstance->RehashUsersAndChans(); - FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect()); - if (!ServerInstance->ConfigThread) - { - ServerInstance->Config->RehashUser = user; - ServerInstance->Config->RehashParameter = pcnt ? parameters[0] : ""; + ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, user->uuid); + ServerInstance->Threads->Start(ServerInstance->ConfigThread); - ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, false, user); - ServerInstance->Threads->Create(ServerInstance->ConfigThread); + return CMD_SUCCESS; } else { - /* A rehash is already in progress! ahh shit. */ + /* + * 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); + 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; } + +COMMAND_INIT(CommandRehash)