Fix silly oversight discovered by tra26 (thanks!) where the core tries to handle...

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

diff --git a/src/server.cpp b/src/server.cpp
index a24a1092f59645eddcac338a30103821362885b9..44f2ce78f8387f9b0816487978c1990de8675b82 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDserver */
+/* $Core */
 
 #include <signal.h>
 #include "exitcodes.h"
@@ -23,7 +23,7 @@ void InspIRCd::SignalHandler(int signal)
        switch (signal)
        {
                case SIGHUP:
-                       Rehash();
+                       Rehash("due to SIGHUP");
                        break;
                case SIGTERM:
                        Exit(signal);
@@ -34,7 +34,9 @@ void InspIRCd::SignalHandler(int signal)
 void InspIRCd::Exit(int status)
 {
 #ifdef WINDOWS
-       delete WindowsIPC;
+       if (WindowsIPC)
+               delete WindowsIPC;
+       SetServiceStopped(status);
 #endif
        if (this)
        {
@@ -44,33 +46,26 @@ void InspIRCd::Exit(int status)
        exit (status);
 }
 
-void InspIRCd::Rehash()
+void RehashHandler::Call(const std::string &reason)
 {
-       this->SNO->WriteToSnoMask('A', "Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName));
-       this->RehashUsersAndChans();
-       FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
-       if (!this->ConfigThread)
+       Server->RehashFinishMutex->Lock();
+       Server->SNO->WriteToSnoMask('A', "Rehashing config file %s %s",ServerConfig::CleanFilename(Server->ConfigFileName), reason.c_str());
+       Server->RehashUsersAndChans();
+       FOREACH_MOD_I(Server, I_OnGarbageCollect, OnGarbageCollect());
+       if (!Server->ConfigThread)
        {
-               Config->RehashUser = NULL;
-               Config->RehashParameter = "";
+               Server->Config->RehashUserUID = "";
+               Server->Config->RehashParameter = "";
 
-               ConfigThread = new ConfigReaderThread(this, false, NULL);
-               Threads->Create(ConfigThread);
+               Server->ConfigThread = new ConfigReaderThread(Server, false, "");
+               Server->Threads->Create(Server->ConfigThread);
        }
+       Server->RehashFinishMutex->Unlock();
 }
 
 void InspIRCd::RehashServer()
 {
-       this->SNO->WriteToSnoMask('A', "Rehashing config file");
-       this->RehashUsersAndChans();
-       if (!this->ConfigThread)
-       {
-               Config->RehashUser = NULL;
-               Config->RehashParameter = "";
-
-               ConfigThread = new ConfigReaderThread(this, false, NULL);
-               Threads->Create(ConfigThread);
-       }
+       this->Rehash("");
 }
 
 std::string InspIRCd::GetVersionString()
@@ -91,9 +86,9 @@ void InspIRCd::BuildISupport()
 {
        // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
        std::stringstream v;
-       v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
-       v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets;
-       v << " AWAYLEN=" << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
+       v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax;
+       v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic << " KICKLEN=" << Config->Limits.MaxKick << " MAXTARGETS=" << Config->MaxTargets;
+       v << " AWAYLEN=" << Config->Limits.MaxAway << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
        Config->data005 = v.str();
        FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
        Config->Update005();