Annotations

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 211d1b6173b164dc021b8ef9571e73b896e63aa4..4afe7afeba1fcdfcdd4774666c3261609b3d795a 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -15,32 +15,12 @@
  */
 
 #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"
 
 static char TIMESTR[26];
@@ -83,8 +63,8 @@ void InspIRCd::Log(int level, const std::string &text)
 
        if (Config->log_file && Config->writelog)
        {
-               fprintf(Config->log_file,"%s %s\n",TIMESTR,text.c_str());
-               fflush(Config->log_file);
+               std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n";
+               this->Logger->WriteLogLine(out);
        }
 
        if (Config->nofork)
@@ -320,13 +300,13 @@ void InspIRCd::SendError(const char *s)
 }
 
 // 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;
 
@@ -338,7 +318,7 @@ int InspIRCd::registered_usercount()
        return c;
 }
 
-int InspIRCd::usercount_invisible()
+int InspIRCd::InvisibleUserCount()
 {
        int c = 0;
 
@@ -350,7 +330,7 @@ int InspIRCd::usercount_invisible()
        return c;
 }
 
-int InspIRCd::usercount_opers()
+int InspIRCd::OperCount()
 {
        int c = 0;
 
@@ -362,7 +342,7 @@ int InspIRCd::usercount_opers()
        return c;
 }
 
-int InspIRCd::usercount_unknown()
+int InspIRCd::UnregisteredUserCount()
 {
        int c = 0;
 
@@ -376,12 +356,12 @@ int InspIRCd::usercount_unknown()
        return c;
 }
 
-long InspIRCd::chancount()
+long InspIRCd::ChannelCount()
 {
        return chanlist.size();
 }
 
-long InspIRCd::local_count()
+long InspIRCd::LocalUserCount()
 {
        int c = 0;
 
@@ -446,6 +426,8 @@ void InspIRCd::OpenLog(char** argv, int argc)
                        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;
        }
 
@@ -456,6 +438,8 @@ void InspIRCd::OpenLog(char** argv, int argc)
                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()