X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_rehash.cpp;h=f71219f7561729f5cdbead9efed86dcd59798c98;hb=5613d701785b61e09a2327bdea41acdd25cb9ef5;hp=41b6936f6c249bb8c083ae76bf73ed8b270ca377;hpb=94ab2b6eb5c8d719da0d9b72bc74ee29017d7995;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp index 41b6936f6..f71219f75 100644 --- a/src/commands/cmd_rehash.cpp +++ b/src/commands/cmd_rehash.cpp @@ -1,86 +1,104 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2008 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include "inspircd.h" -#include "xline.h" -#include "commands/cmd_rehash.h" - +#include "inspircd.h" -extern "C" DllExport Command* init_command(InspIRCd* Instance) +/** Handle /REHASH. + */ +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 = "[]"; } + /** Handle command. + * @param parameters The parameters to the 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) +CmdResult CommandRehash::Handle (const std::vector& parameters, User *user) { - user->WriteNumeric(382, "%s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName)); - std::string old_disabled = ServerInstance->Config->DisabledCommands; + std::string param = parameters.size() ? parameters[0] : ""; - ServerInstance->Logs->Log("fuckingrehash", DEBUG, "parc %d p0 %s", pcnt, parameters[0]); - if (pcnt && parameters[0][0] != '-') + FOREACH_MOD(OnPreRehash, (user, param)); + + if (param.empty()) + { + // standard rehash of local server + } + else if (param.find_first_of("*.") != std::string::npos) { - if (!ServerInstance->MatchText(ServerInstance->Config->ServerName, parameters[0])) + // 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])); - return CMD_SUCCESS; - } - - // Rehash for me. - FOREACH_MOD(I_OnRehash,OnRehash(user, "")); + // parameterized rehash - std::string m = std::string(user->nick) + " is rehashing config file " + ServerConfig::CleanFilename(ServerInstance->ConfigFileName); - ServerInstance->SNO->WriteToSnoMask('A', m); - ServerInstance->PI->SendSNONotice("A", m); - ServerInstance->Logs->CloseLogs(); + // the leading "-" is optional; remove it if present. + if (param[0] == '-') + param = param.substr(1); - 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->PI->SendSNONotice("A", m); + FOREACH_MOD(OnModuleRehash, (user, param)); + return CMD_SUCCESS; } - ServerInstance->RehashUsersAndChans(); - FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect()); - + // Rehash for me. Try to start the rehash thread if (!ServerInstance->ConfigThread) { - ServerInstance->Config->RehashUser = user; - ServerInstance->Config->RehashParameter = pcnt ? parameters[0] : ""; + std::string m = user->nick + " is rehashing config file " + FileSystem::GetFileName(ServerInstance->ConfigFileName) + " on " + ServerInstance->Config->ServerName; + ServerInstance->SNO->WriteGlobalSno('a', m); - ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, false, user); - ServerInstance->Threads->Create(ServerInstance->ConfigThread); + if (IS_LOCAL(user)) + user->WriteNumeric(RPL_REHASHING, "%s :Rehashing", FileSystem::GetFileName(ServerInstance->ConfigFileName).c_str()); + else + ServerInstance->PI->SendUserNotice(user, "*** Rehashing server " + FileSystem::GetFileName(ServerInstance->ConfigFileName)); + + /* Don't do anything with the logs here -- logs are restarted + * after the config thread has completed. + */ + ServerInstance->Rehash(user->uuid); } 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->WriteNotice("*** Could not rehash: A rehash is already in progress."); else ServerInstance->PI->SendUserNotice(user, "*** Could not rehash: A rehash is already in progress."); - - return CMD_FAILURE; } + // Always return success so spanningtree forwards an incoming REHASH even if we failed return CMD_SUCCESS; } + +COMMAND_INIT(CommandRehash)