Fix typos

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 211d1b6173b164dc021b8ef9571e73b896e63aa4..07f9228d479323b39726572d2f529b387d605ea6 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -38,7 +38,7 @@
 #include "xline.h"
 #include "commands.h"
 #include "inspstring.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "typedefs.h"
 #include "inspircd.h"
@@ -83,8 +83,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 +320,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 +338,7 @@ int InspIRCd::registered_usercount()
        return c;
 }
 
-int InspIRCd::usercount_invisible()
+int InspIRCd::InvisibleUserCount()
 {
        int c = 0;
 
@@ -350,7 +350,7 @@ int InspIRCd::usercount_invisible()
        return c;
 }
 
-int InspIRCd::usercount_opers()
+int InspIRCd::OperCount()
 {
        int c = 0;
 
@@ -362,7 +362,7 @@ int InspIRCd::usercount_opers()
        return c;
 }
 
-int InspIRCd::usercount_unknown()
+int InspIRCd::UnregisteredUserCount()
 {
        int c = 0;
 
@@ -376,12 +376,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 +446,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 +458,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()