#include "xline.h"
#include "exitcodes.h"
-static char TIMESTR[26];
-static time_t LAST = 0;
-
/** 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, ...)
{
- /* sanity check, just in case */
- if (!this->Config || !this->Logger)
- return;
-
- /* Do this check again here so that we save pointless vsnprintf calls */
- if ((level < Config->LogLevel) && !Config->forcedebug)
- return;
-
va_list argsPtr;
char textbuffer[65536];
void InspIRCd::Log(int level, const std::string &text)
{
- /* sanity check, just in case */
- if (!this->Config || !this->Logger)
- return;
-
- /* If we were given -debug we output all messages, regardless of configured loglevel */
- if ((level < Config->LogLevel) && !Config->forcedebug)
- return;
-
- if (Time() != LAST)
- {
- time_t local = Time();
- struct tm *timeinfo = localtime(&local);
-
- strlcpy(TIMESTR,asctime(timeinfo),26);
- TIMESTR[24] = ':';
- LAST = Time();
- }
-
- if (Config->log_file && Config->writelog)
- {
- std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n";
- this->Logger->WriteLogLine(out);
- }
-
- if (Config->nofork)
- {
- printf("%s %s\n", TIMESTR, text.c_str());
- }
+ 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)
if (!Config->log_file)
{
- this->Logger = NULL;
return false;
}
- this->Logger = new FileLogger(this, Config->log_file);
+ 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;
}
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);
}
}
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);
}
}
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;