diff options
Diffstat (limited to 'src/common/Logging')
-rw-r--r-- | src/common/Logging/Appender.cpp | 2 | ||||
-rw-r--r-- | src/common/Logging/Appender.h | 2 | ||||
-rw-r--r-- | src/common/Logging/Log.cpp | 6 | ||||
-rw-r--r-- | src/common/Logging/Log.h | 6 | ||||
-rw-r--r-- | src/common/Logging/LogMessage.cpp | 2 | ||||
-rw-r--r-- | src/common/Logging/LogMessage.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/common/Logging/Appender.cpp b/src/common/Logging/Appender.cpp index 5e26d2ff1ba..77c4352b469 100644 --- a/src/common/Logging/Appender.cpp +++ b/src/common/Logging/Appender.cpp @@ -70,7 +70,7 @@ void Appender::write(LogMessage* message) _write(message); } -const char* Appender::getLogLevelString(LogLevel level) +char const* Appender::getLogLevelString(LogLevel level) { switch (level) { diff --git a/src/common/Logging/Appender.h b/src/common/Logging/Appender.h index c3768058a1b..ed98fd56935 100644 --- a/src/common/Logging/Appender.h +++ b/src/common/Logging/Appender.h @@ -40,7 +40,7 @@ class TC_COMMON_API Appender void setLogLevel(LogLevel); void write(LogMessage* message); - static const char* getLogLevelString(LogLevel level); + static char const* getLogLevelString(LogLevel level); virtual void setRealmId(uint32 /*realmId*/) { } private: diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp index 209a952dad2..c50b0e6c52e 100644 --- a/src/common/Logging/Log.cpp +++ b/src/common/Logging/Log.cpp @@ -61,7 +61,7 @@ void Log::CreateAppenderFromConfig(std::string const& appenderName) if (appenderName.empty()) return; - // Format=type, level, flags, optional1, optional2 + // Format = type, level, flags, optional1, optional2 // if type = File. optional1 = file and option2 = mode // if type = Console. optional1 = Color std::string options = sConfigMgr->GetStringDefault(appenderName.c_str(), ""); @@ -213,7 +213,7 @@ void Log::RegisterAppender(uint8 index, AppenderCreatorFn appenderCreateFn) appenderFactory[index] = appenderCreateFn; } -void Log::outMessage(std::string const& filter, LogLevel const level, std::string&& message) +void Log::outMessage(std::string const& filter, LogLevel level, std::string&& message) { write(std::make_unique<LogMessage>(level, filter, std::move(message))); } @@ -279,7 +279,7 @@ std::string Log::GetTimestampStr() } } -bool Log::SetLogLevel(std::string const& name, const char* newLevelc, bool isLogger /* = true */) +bool Log::SetLogLevel(std::string const& name, char const* newLevelc, bool isLogger /* = true */) { LogLevel newLevel = LogLevel(atoi(newLevelc)); if (newLevel < 0) diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h index 6086ed93d41..27ce6da1cba 100644 --- a/src/common/Logging/Log.h +++ b/src/common/Logging/Log.h @@ -42,7 +42,7 @@ namespace Trinity typedef Appender*(*AppenderCreatorFn)(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags, std::vector<char const*>&& extraArgs); -template<class AppenderImpl> +template <class AppenderImpl> Appender* CreateAppender(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags, std::vector<char const*>&& extraArgs) { return new AppenderImpl(id, name, level, flags, std::forward<std::vector<char const*>>(extraArgs)); @@ -109,7 +109,7 @@ class TC_COMMON_API Log void ReadAppendersFromConfig(); void ReadLoggersFromConfig(); void RegisterAppender(uint8 index, AppenderCreatorFn appenderCreateFn); - void outMessage(std::string const& filter, LogLevel const level, std::string&& message); + void outMessage(std::string const& filter, LogLevel level, std::string&& message); void outCommand(std::string&& message, std::string&& param1); std::unordered_map<uint8, AppenderCreatorFn> appenderFactory; @@ -141,7 +141,7 @@ class TC_COMMON_API Log } #if TRINITY_PLATFORM != TRINITY_PLATFORM_WINDOWS -void check_args(const char*, ...) ATTR_PRINTF(1, 2); +void check_args(char const*, ...) ATTR_PRINTF(1, 2); void check_args(std::string const&, ...); // This will catch format errors on build time diff --git a/src/common/Logging/LogMessage.cpp b/src/common/Logging/LogMessage.cpp index 143203946e8..5f10087d1f0 100644 --- a/src/common/Logging/LogMessage.cpp +++ b/src/common/Logging/LogMessage.cpp @@ -36,7 +36,7 @@ std::string LogMessage::getTimeStr(time_t time) return Trinity::StringFormat("%04d-%02d-%02d_%02d:%02d:%02d", aTm.tm_year + 1900, aTm.tm_mon + 1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); } -std::string LogMessage::getTimeStr() +std::string LogMessage::getTimeStr() const { return getTimeStr(mtime); } diff --git a/src/common/Logging/LogMessage.h b/src/common/Logging/LogMessage.h index 25faf310796..d9709b43c4c 100644 --- a/src/common/Logging/LogMessage.h +++ b/src/common/Logging/LogMessage.h @@ -32,7 +32,7 @@ struct TC_COMMON_API LogMessage LogMessage& operator=(LogMessage const& /*other*/) = delete; static std::string getTimeStr(time_t time); - std::string getTimeStr(); + std::string getTimeStr() const; LogLevel const level; std::string const type; |