More stuff

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 907a4c14d0680cabfb9c098b3acb7602dd8b4b06..de725d0e1601f14bfafd5325a3e4edebab1d69e5 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -38,6 +38,7 @@
 #include "command_parse.h"
 #include "exitcodes.h"
 #include "caller.h"
+#include "testsuite.h"
 
 using irc::sockets::insp_ntoa;
 using irc::sockets::insp_inaddr;
@@ -47,7 +48,9 @@ InspIRCd* SI = NULL;
 int* mysig = NULL;
 
 
-/* Burlex: Moved from exitcodes.h -- due to duplicate symbols */
+/* Moved from exitcodes.h -- due to duplicate symbols -- Burlex
+ * XXX this is a bit ugly. -- w00t
+ */
 const char* ExitCodes[] =
 {
                "No error", /* 0 */
@@ -91,6 +94,8 @@ void InspIRCd::Cleanup()
        /* We do this more than once, so that any service providers get a
         * chance to be unhooked by the modules using them, but then get
         * a chance to be removed themsleves.
+        *
+        * XXX there may be a better way to do this with 1.2
         */
        for (int tries = 0; tries < 3; tries++)
        {
@@ -227,14 +232,14 @@ bool InspIRCd::DaemonSeed()
        rlimit rl;
        if (getrlimit(RLIMIT_CORE, &rl) == -1)
        {
-               this->Log(DEFAULT,"Failed to getrlimit()!");
+               this->Logs->Log("STARTUP",DEFAULT,"Failed to getrlimit()!");
                return false;
        }
        else
        {
                rl.rlim_cur = rl.rlim_max;
                if (setrlimit(RLIMIT_CORE, &rl) == -1)
-                       this->Log(DEFAULT,"setrlimit() failed, cannot increase coredump size.");
+                       this->Logs->Log("STARTUP",DEFAULT,"setrlimit() failed, cannot increase coredump size.");
        }
 
        return true;
@@ -263,7 +268,7 @@ void InspIRCd::WritePID(const std::string &filename)
        else
        {
                printf("Failed to write PID-file '%s', exiting.\n",fname.c_str());
-               this->Log(DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str());
+               this->Logs->Log("STARTUP",DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str());
                Exit(EXIT_STATUS_PID);
        }
 }
@@ -303,6 +308,11 @@ InspIRCd::InspIRCd(int argc, char** argv)
        SE = SEF->Create(this);
        delete SEF;
 
+
+       ThreadEngineFactory* tef = new ThreadEngineFactory();
+       this->Threads = tef->Create(this);
+       delete tef;
+
        this->s_signal = 0;
        
        // Create base manager classes early, so nothing breaks
@@ -338,7 +348,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->Config->operclass.clear();
 
        this->TIME = this->OLDTIME = this->startup_time = time(NULL);
-       this->time_delta = 0;
        srand(this->TIME);
 
        *this->LogFileName = 0;
@@ -381,6 +390,9 @@ InspIRCd::InspIRCd(int argc, char** argv)
                }
        }
 
+       if (do_testsuite)
+               do_nofork = do_debug = true;
+
        if (do_version)
        {
                printf("\n%s r%s\n", VERSION, REVISION);
@@ -419,7 +431,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        if (!ServerConfig::FileExists(this->ConfigFileName))
        {
                printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
-               this->Log(DEFAULT,"Unable to open config file %s", this->ConfigFileName);
+               this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName);
                Exit(EXIT_STATUS_CONFIG);
        }
 
@@ -470,15 +482,15 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        SE->RecoverFromFork();
 
-       /* Read config, pass 0. At the end if this pass,
-        * the Config->IncludeFiles is populated, we call
-        * Config->StartDownloads to initialize the downlaods of all
-        * these files.
+       /* During startup we don't actually initialize this
+        * in the thread engine.
         */
-       Config->Read(true, NULL, 0);
-       Config->DoDownloads();
-       /* We have all the files we can get, initiate pass 1 */
-       Config->Read(true, NULL, 1);
+       this->ConfigThread = new ConfigReaderThread(this, true, NULL);
+       ConfigThread->Run();
+       delete ConfigThread;
+       this->ConfigThread = NULL;
+
+       this->Res = new DNS(this);
 
        this->AddServerName(Config->ServerName);
 
@@ -523,18 +535,18 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        printf("\n");
 
-       /*this->Modules->LoadAll();*/
+       this->Modules->LoadAll();
        
        /* Just in case no modules were loaded - fix for bug #101 */
        this->BuildISupport();
        InitializeDisabledCommands(Config->DisabledCommands, this);
 
-       if ((Config->ports.size() == 0) && (found_ports > 0))
+       /*if ((Config->ports.size() == 0) && (found_ports > 0))
        {
                printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
                Logs->Log("STARTUP", DEFAULT,"ERROR: I couldn't bind any ports! Something else is bound to those ports!");
                Exit(EXIT_STATUS_BIND);
-       }
+       }*/
 
        if (Config->ports.size() != (unsigned int)found_ports)
        {
@@ -624,6 +636,20 @@ int InspIRCd::Run()
                static char window_title[100];
 #endif
 
+               if (this->ConfigThread && this->ConfigThread->GetExitFlag())
+               {
+                       /* Rehash has completed */
+                       this->Logs->Log("CONFIG",DEBUG,"Detected ConfigThread exiting, tidying up...");
+                       delete ConfigThread;
+                       this->XLines->CheckELines();
+                       this->XLines->ApplyLines();
+                       this->Res->Rehash();
+                       this->ResetMaxBans();
+                       InitializeDisabledCommands(Config->DisabledCommands, this);
+                       FOREACH_MOD_I(this, I_OnRehash, OnRehash(Config->RehashUser, Config->RehashParameter));
+                       this->BuildISupport();
+               }
+
                /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
                 * Once per loop iteration is pleanty.
                 */
@@ -697,7 +723,7 @@ void InspIRCd::BufferedSocketCull()
 {
        for (std::map<BufferedSocket*,BufferedSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
        {
-               Log(DEBUG,"Cull socket");
+               this->Logs->Log("MISC",DEBUG,"Cull socket");
                SE->DelFd(x->second);
                x->second->Close();
                delete x->second;
@@ -736,26 +762,11 @@ bool InspIRCd::AllModulesReportReady(User* user)
        return true;
 }
 
-time_t InspIRCd::Time(bool delta)
+time_t InspIRCd::Time()
 {
-       if (delta)
-               return TIME + time_delta;
        return TIME;
 }
 
-int InspIRCd::SetTimeDelta(int delta)
-{
-       int old = time_delta;
-       time_delta = delta;
-       this->Log(DEBUG, "Time delta set to %d (was %d)", time_delta, old);
-       return old;
-}
-
-int InspIRCd::GetTimeDelta()
-{
-       return time_delta;
-}
-
 void InspIRCd::SetSignal(int signal)
 {
        *mysig = signal;