diff options
| -rw-r--r-- | include/filelogger.h | 4 | ||||
| -rw-r--r-- | include/logger.h | 12 | ||||
| -rw-r--r-- | src/filelogger.cpp | 5 | ||||
| -rw-r--r-- | src/logger.cpp | 7 |
4 files changed, 13 insertions, 15 deletions
diff --git a/include/filelogger.h b/include/filelogger.h index 94456fecc..ce571c3ae 100644 --- a/include/filelogger.h +++ b/include/filelogger.h @@ -29,9 +29,9 @@ class CoreExport FileLogStream : public LogStream private: FileWriter *f; public: - FileLogStream(int loglevel, FileWriter *fw); + FileLogStream(LogLevel loglevel, FileWriter *fw); virtual ~FileLogStream(); - virtual void OnLog(int loglevel, const std::string &type, const std::string &msg); + virtual void OnLog(LogLevel loglevel, const std::string &type, const std::string &msg); }; diff --git a/include/logger.h b/include/logger.h index 6bf64801f..2ea280be8 100644 --- a/include/logger.h +++ b/include/logger.h @@ -87,11 +87,11 @@ class CoreExport FileWriter class CoreExport LogStream : public classbase { protected: - int loglvl; + LogLevel loglvl; public: static const char LogHeader[]; - LogStream(int loglevel) : loglvl(loglevel) + LogStream(LogLevel loglevel) : loglvl(loglevel) { } @@ -103,13 +103,13 @@ class CoreExport LogStream : public classbase /** Changes the loglevel for this LogStream on-the-fly. * This is needed for -nofork. But other LogStreams could use it to change loglevels. */ - void ChangeLevel(int lvl) { this->loglvl = lvl; } + void ChangeLevel(LogLevel lvl) { this->loglvl = lvl; } /** Called when there is stuff to log for this particular logstream. The derived class may take no action with it, or do what it * wants with the output, basically. loglevel and type are primarily for informational purposes (the level and type of the event triggered) * and msg is, of course, the actual message to log. */ - virtual void OnLog(int loglevel, const std::string &type, const std::string &msg) = 0; + virtual void OnLog(LogLevel loglevel, const std::string &type, const std::string &msg) = 0; }; typedef std::map<FileWriter*, int> FileLogMap; @@ -213,12 +213,12 @@ class CoreExport LogManager * @param loglevel Log message level (LOG_DEBUG, LOG_VERBOSE, LOG_DEFAULT, LOG_SPARSE, LOG_NONE) * @param msg The message to be logged (literal). */ - void Log(const std::string &type, int loglevel, const std::string &msg); + void Log(const std::string &type, LogLevel loglevel, const std::string &msg); /** Logs an event, sending it to all LogStreams registered for the type. * @param type Log message type (ex: "USERINPUT", "MODULE", ...) * @param loglevel Log message level (LOG_DEBUG, LOG_VERBOSE, LOG_DEFAULT, LOG_SPARSE, LOG_NONE) * @param fmt The format of the message to be logged. See your C manual on printf() for details. */ - void Log(const std::string &type, int loglevel, const char *fmt, ...) CUSTOM_PRINTF(4, 5); + void Log(const std::string &type, LogLevel loglevel, const char *fmt, ...) CUSTOM_PRINTF(4, 5); }; diff --git a/src/filelogger.cpp b/src/filelogger.cpp index 245cbbaab..acb210ecb 100644 --- a/src/filelogger.cpp +++ b/src/filelogger.cpp @@ -26,8 +26,7 @@ #include "socketengine.h" #include "filelogger.h" -FileLogStream::FileLogStream(int loglevel, FileWriter *fw) - : LogStream(loglevel), f(fw) +FileLogStream::FileLogStream(LogLevel loglevel, FileWriter *fw) : LogStream(loglevel), f(fw) { ServerInstance->Logs->AddLoggerRef(f); } @@ -38,7 +37,7 @@ FileLogStream::~FileLogStream() ServerInstance->Logs->DelLoggerRef(f); } -void FileLogStream::OnLog(int loglevel, const std::string &type, const std::string &text) +void FileLogStream::OnLog(LogLevel loglevel, const std::string &type, const std::string &text) { static std::string TIMESTR; static time_t LAST = 0; diff --git a/src/logger.cpp b/src/logger.cpp index bc1dd3253..c83a423f0 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -21,7 +21,6 @@ #include "inspircd.h" - #include "filelogger.h" /* @@ -86,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; @@ -297,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) { @@ -314,7 +313,7 @@ void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ... this->Log(type, loglevel, std::string(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) { |