Add a note about interfaces that may be useful

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 8ae88e75245f8f38b844df645da8852e19842049..487af4511fde55efa2e9261b0044d4cd89921b09 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -36,8 +36,7 @@ void InspIRCd::Log(int level, const char* text, ...)
 
 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);
+       this->Logs->Log("DEPRECATED", level, "Deprecated use of InspIRCd::Log(), message = %s", text.c_str());
 }
 
 std::string InspIRCd::GetServerDescription(const char* servername)
@@ -303,6 +302,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)
@@ -324,8 +329,11 @@ bool InspIRCd::OpenLog(char**, int)
                return false;
        }
 
-       FileLogStream *f = new FileLogStream(this, Config->LogLevel, Config->log_file);
-       this->Logs->AddLogType("*", f);
+       FileWriter* fw = new FileWriter(this, Config->log_file);
+       FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : Config->LogLevel), fw);
+
+       this->Logs->AddLogType("*", f, true);
+
        return true;
 }
 
@@ -414,19 +422,19 @@ long InspIRCd::Duration(const std::string &str)
        return total + subtotal;
 }
 
-bool InspIRCd::ULine(const char* server)
+bool InspIRCd::ULine(const char* sserver)
 {
-       if (!server)
+       if (!sserver)
                return false;
-       if (!*server)
+       if (!*sserver)
                return true;
 
-       return (Config->ulines.find(server) != Config->ulines.end());
+       return (Config->ulines.find(sserver) != Config->ulines.end());
 }
 
-bool InspIRCd::SilentULine(const char* server)
+bool InspIRCd::SilentULine(const char* sserver)
 {
-       std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
+       std::map<irc::string,bool>::iterator n = Config->ulines.find(sserver);
        if (n != Config->ulines.end())
                return n->second;
        else return false;