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)
/* 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)
}
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;
}
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;