*/
#include <stdarg.h>
-#include "inspircd_config.h"
#include "configreader.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <signal.h>
-#include <time.h>
-#include <string>
-#include <sstream>
-#ifdef HAS_EXECINFO
-#include <execinfo.h>
-#endif
-#include "connection.h"
#include "users.h"
-#include "ctables.h"
-#include "globals.h"
#include "modules.h"
-#include "dynamic.h"
#include "wildcard.h"
#include "mode.h"
#include "xline.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
#include "inspircd.h"
-extern int MODCOUNT;
-extern ModuleList modules;
-
-extern time_t TIME;
-extern char lowermap[255];
-extern std::vector<userrec*> all_opers;
-
-char LOG_FILE[MAXBUF];
-
static char TIMESTR[26];
static time_t LAST = 0;
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- InspIRCd::Log(level, std::string(textbuffer));
+ this->Log(level, std::string(textbuffer));
}
void InspIRCd::Log(int level, const std::string &text)
{
- extern InspIRCd* ServerInstance;
-
- if (!ServerInstance || !ServerInstance->Config)
+ if (!this->Config)
return;
/* If we were given -debug we output all messages, regardless of configured loglevel */
- if ((level < ServerInstance->Config->LogLevel) && !ServerInstance->Config->forcedebug)
+ if ((level < Config->LogLevel) && !Config->forcedebug)
return;
- if (TIME != LAST)
+ if (Time() != LAST)
{
- struct tm *timeinfo = localtime(&TIME);
+ time_t local = Time();
+ struct tm *timeinfo = localtime(&local);
strlcpy(TIMESTR,asctime(timeinfo),26);
TIMESTR[24] = ':';
- LAST = TIME;
+ LAST = Time();
}
- if (ServerInstance->Config->log_file && ServerInstance->Config->writelog)
+ if (Config->log_file && Config->writelog)
{
- fprintf(ServerInstance->Config->log_file,"%s %s\n",TIMESTR,text.c_str());
- fflush(ServerInstance->Config->log_file);
+ std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n";
+ this->Logger->WriteLogLine(out);
}
- if (ServerInstance->Config->nofork)
+ if (Config->nofork)
{
printf("%s %s\n", TIMESTR, text.c_str());
}
void InspIRCd::WriteOpers(const std::string &text)
{
- for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+ for (std::vector<userrec*>::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++)
{
userrec* a = *i;
if (IS_LOCAL(a) && a->modes[UM_SERVERNOTICE])
if ((!text) || (!modes) || (!flags))
{
- log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
+ this->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
return;
}
}
}
-void InspIRCd::Error(int status)
-{
- void *array[300];
- size_t size;
- char **strings;
-
- signal(SIGALRM, SIG_IGN);
- signal(SIGPIPE, SIG_IGN);
- signal(SIGTERM, SIG_IGN);
- signal(SIGABRT, SIG_IGN);
- signal(SIGSEGV, SIG_IGN);
- signal(SIGURG, SIG_IGN);
- signal(SIGKILL, SIG_IGN);
- log(DEFAULT,"*** fell down a pothole in the road to perfection ***");
-#ifdef HAS_EXECINFO
- log(DEFAULT,"Please report the backtrace lines shown below with any bugreport to the bugtracker at http://www.inspircd.org/bugtrack/");
- size = backtrace(array, 30);
- strings = backtrace_symbols(array, size);
- for (size_t i = 0; i < size; i++) {
- log(DEFAULT,"[%d] %s", i, strings[i]);
- }
- free(strings);
-#else
- log(DEFAULT,"You do not have execinfo.h so i could not backtrace -- on FreeBSD, please install the libexecinfo port.");
-#endif
- signal(SIGSEGV, SIG_DFL);
- if (raise(SIGSEGV) == -1)
- {
- log(DEFAULT,"What the hell, i couldnt re-raise SIGSEGV! Error: %s",strerror(errno));
- }
- Exit(status);
-}
-
// this function counts all users connected, wether they are registered or NOT.
-int InspIRCd::usercnt()
+int InspIRCd::UserCount()
{
return clientlist.size();
}
// this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state
-int InspIRCd::registered_usercount()
+int InspIRCd::RegisteredUserCount()
{
int c = 0;
return c;
}
-int InspIRCd::usercount_invisible()
+int InspIRCd::InvisibleUserCount()
{
int c = 0;
return c;
}
-int InspIRCd::usercount_opers()
+int InspIRCd::OperCount()
{
int c = 0;
return c;
}
-int InspIRCd::usercount_unknown()
+int InspIRCd::UnregisteredUserCount()
{
int c = 0;
return c;
}
-long InspIRCd::chancount()
+long InspIRCd::ChannelCount()
{
return chanlist.size();
}
-long InspIRCd::local_count()
+long InspIRCd::LocalUserCount()
{
int c = 0;
void InspIRCd::OpenLog(char** argv, int argc)
{
- if (!*LOG_FILE)
+ if (!*this->LogFileName)
{
if (Config->logpath == "")
{
}
else
{
- Config->log_file = fopen(LOG_FILE,"a+");
+ Config->log_file = fopen(this->LogFileName,"a+");
if (!Config->log_file)
{
printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
Exit(ERROR);
}
+
+ this->Logger = new FileLogger(this, Config->log_file);
return;
}
printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
Exit(ERROR);
}
+
+ this->Logger = new FileLogger(this, Config->log_file);
}
void InspIRCd::CheckRoot()
if (geteuid() == 0)
{
printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
- log(DEFAULT,"InspIRCd: startup: not starting with UID 0!");
+ this->Log(DEFAULT,"Cant start as root");
Exit(ERROR);
}
}
if (*Config->DieValue)
{
printf("WARNING: %s\n\n",Config->DieValue);
- log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",Config->DieValue);
+ this->Log(DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
Exit(ERROR);
}
}
{
char configToken[MAXBUF];
Config->module_names.clear();
- MODCOUNT = -1;
+ this->ModCount = -1;
for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
{
if (!this->LoadModule(configToken))
{
- log(DEFAULT,"Exiting due to a module loader error.");
+ this->Log(DEFAULT,"There was an error loading a module: %s", this->ModuleError());
printf("\nThere was an error loading a module: %s\n\n",this->ModuleError());
Exit(ERROR);
}
}
- log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1);
+ printf("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->ModCount+1, this->ModCount+1 == 1 ? " has" : "s have");
+ this->Log(DEFAULT,"Total loaded modules: %d", this->ModCount+1);
}
projects / user / henk / code / inspircd.git / blobdiff