Merge pull request #545 from SaberUK/master+logging-cleanup

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

diff --git a/src/logger.cpp b/src/logger.cpp
index 2b0b623f604f6548d3da55f4a609e22113c7e1d1..bbbb7eafa98428cb1db7915c4fc042bd89ec6cd9 100644 (file)
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -21,7 +21,6 @@
 
 
 #include "inspircd.h"
-
 #include "filelogger.h"
 
 /*
@@ -51,6 +50,10 @@
  *
  */
 
+const char LogStream::LogHeader[] =
+       "Log started for " VERSION " (" REVISION ", " MODULE_INIT_STR ")"
+       " - compiled on " SYSTEM;
+
 LogManager::LogManager()
 {
        Logging = false;
@@ -82,7 +85,7 @@ void LogManager::OpenFileLogs()
                }
                std::string type = tag->getString("type");
                std::string level = tag->getString("level");
-               int loglevel = LOG_DEFAULT;
+               LogLevel loglevel = LOG_DEFAULT;
                if (level == "rawio")
                {
                        loglevel = LOG_RAWIO;
@@ -126,7 +129,7 @@ void LogManager::OpenFileLogs()
                        fw = fwi->second;
                }
                FileLogStream* fls = new FileLogStream(loglevel, fw);
-               fls->OnLog(LOG_SPARSE, "HEADER", InspIRCd::LogHeader);
+               fls->OnLog(LOG_SPARSE, "HEADER", LogStream::LogHeader);
                AddLogTypes(type, fls, true);
        }
 }
@@ -293,7 +296,7 @@ bool LogManager::DelLogType(const std::string &type, LogStream *l)
        return true;
 }
 
-void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ...)
+void LogManager::Log(const std::string &type, LogLevel loglevel, const char *fmt, ...)
 {
        if (Logging)
                return;
@@ -303,7 +306,7 @@ void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ...
        this->Log(type, loglevel, buf);
 }
 
-void LogManager::Log(const std::string &type, int loglevel, const std::string &msg)
+void LogManager::Log(const std::string &type, LogLevel loglevel, const std::string &msg)
 {
        if (Logging)
        {