m_spanningtree Fix routing of ROUTE_TYPE_MESSAGE messages

[user/henk/code/inspircd.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 55c230f9694af47cf289c0bda502cc1520fa85fb..1d1f5264191e3afb4b87c79c34fe1f8a5b9c2d60 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -31,12 +31,13 @@ void InspIRCd::SignalHandler(int signal)
 #else
        if (signal == SIGHUP)
        {
-               Rehash("Caught SIGHUP");
+               ServerInstance->SNO->WriteGlobalSno('a', "Rehashing due to SIGHUP");
+               Rehash();
        }
        else if (signal == SIGTERM)
 #endif
        {
-               Exit(signal);
+               Exit(EXIT_STATUS_SIGTERM);
        }
 }
 
@@ -55,13 +56,11 @@ void InspIRCd::Exit(int status)
        exit (status);
 }
 
-void RehashHandler::Call(const std::string &reason)
+void InspIRCd::Rehash(const std::string& uuid)
 {
-       ServerInstance->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()), reason.c_str());
-       FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
        if (!ServerInstance->ConfigThread)
        {
-               ServerInstance->ConfigThread = new ConfigReaderThread("");
+               ServerInstance->ConfigThread = new ConfigReaderThread(uuid);
                ServerInstance->Threads->Start(ServerInstance->ConfigThread);
        }
 }
@@ -173,7 +172,6 @@ void ISupportManager::Build()
        tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MASK_CHANNEL);
        tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
        tokens["CHANTYPES"] = "#";
-       tokens["CHARSET"] = "ascii";
        tokens["ELIST"] = "MU";
        tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick);
        tokens["MAXBANS"] = "64"; // TODO: make this a config setting.
@@ -186,11 +184,11 @@ void ISupportManager::Build()
        tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
        tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
 
-       tokens["FNC"] = tokens["MAP"] = tokens["VBANLIST"] =
+       tokens["FNC"] = tokens["VBANLIST"] =
                tokens["WALLCHOPS"] = tokens["WALLVOICES"];
 
        // Modules can add new tokens and also edit or remove existing tokens
-       FOREACH_MOD(I_On005Numeric, On005Numeric(tokens));
+       FOREACH_MOD(On005Numeric, (tokens));
 
        // EXTBAN is a special case as we need to sort it and prepend a comma.
        std::map<std::string, std::string>::iterator extban = tokens.find("EXTBAN");
@@ -232,5 +230,5 @@ void ISupportManager::Build()
 void ISupportManager::SendTo(LocalUser* user)
 {
        for (std::vector<std::string>::const_iterator i = this->Lines.begin(); i != this->Lines.end(); ++i)
-               user->WriteNumeric(RPL_ISUPPORT, "%s %s", user->nick.c_str(), i->c_str());
+               user->WriteNumeric(RPL_ISUPPORT, *i);
 }