AddClient -> AddUser, to be consistant

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 8e9f4dfd5c8c6289d732f6b60a97f19f38e28cfd..67faee8f54371fd77dc814cf56c5c8e79ac413ab 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -18,28 +18,6 @@
 #include "xline.h"
 #include "exitcodes.h"
 
-/** Log()
- *  Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
- *  is greater than the configured loglevel.
- */
-void InspIRCd::Log(int level, const char* text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[65536];
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, 65536, text, argsPtr);
-       va_end(argsPtr);
-
-       this->Log(level, std::string(textbuffer));
-}
-
-void InspIRCd::Log(int level, const std::string &text)
-{
-       this->Logs->Log("WARNING", DEFAULT, "Deprecated call to InspIRCd::Log()! - log message follows");
-       this->Logs->Log("DEPRECATED", level, text);
-}
-
 std::string InspIRCd::GetServerDescription(const char* servername)
 {
        std::string description;
@@ -303,6 +281,12 @@ bool InspIRCd::IsSID(const std::string &str)
 /* open the proper logfile */
 bool InspIRCd::OpenLog(char**, int)
 {
+       /* This function only happens at startup now (log reopening is done at OnReadConfig stage now instead of rehash) */
+       if (Config->nofork)
+       {
+               this->Logs->SetupNoFork();
+       }
+       if (!Config->writelog) return true; // Skip opening default log if -nolog
        Config->MyDir = Config->GetFullProgDir();
 
        if (!*this->LogFileName)
@@ -325,9 +309,10 @@ bool InspIRCd::OpenLog(char**, int)
        }
 
        FileWriter* fw = new FileWriter(this, Config->log_file);
-       FileLogStream *f = new FileLogStream(this, Config->LogLevel, fw);
+       FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : Config->LogLevel), fw);
+
+       this->Logs->AddLogType("*", f, true);
 
-       this->Logs->AddLogType("*", f);
        return true;
 }
 
@@ -336,7 +321,7 @@ void InspIRCd::CheckRoot()
        if (geteuid() == 0)
        {
                printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
-               this->Log(DEFAULT,"Cant start as root");
+               this->Logs->Log("STARTUP",DEFAULT,"Cant start as root");
                Exit(EXIT_STATUS_ROOT);
        }
 }
@@ -346,7 +331,7 @@ void InspIRCd::CheckDie()
        if (*Config->DieValue)
        {
                printf("WARNING: %s\n\n",Config->DieValue);
-               this->Log(DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
+               this->Logs->Log("CONFIG",DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
                Exit(EXIT_STATUS_DIETAG);
        }
 }