Convert remaining InspIRCd::Log() calls to new logging system

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 907a4c14d0680cabfb9c098b3acb7602dd8b4b06..8999e7ccc8c2117e179299373fd666b5d02e0db7 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);
        }
 }
@@ -338,7 +343,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 +385,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 +426,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);
        }
 
@@ -697,7 +704,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 +743,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;