From cd486622333c9d0c725e882d149fe8d4ad342e2a Mon Sep 17 00:00:00 2001
From: Spp <spp@jorge.gr>
Date: Mon, 11 Nov 2013 14:34:44 +0100
Subject: Core/Logging: Minor changes - Select stderr when writing ERROR and
 FATAL messages - Simplify function defines - Fix `logs` table structure with
 latest logging changes

---
 src/server/shared/Logging/Log.cpp | 84 +++++++--------------------------------
 1 file changed, 14 insertions(+), 70 deletions(-)

(limited to 'src/server/shared/Logging/Log.cpp')

diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 58c22d19df1..bca150b7059 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -75,9 +75,11 @@ void Log::CreateAppenderFromConfig(std::string const& appenderName)
     // if type = File. optional1 = file and option2 = mode
     // if type = Console. optional1 = Color
     std::string options = sConfigMgr->GetStringDefault(appenderName.c_str(), "");
+
     Tokenizer tokens(options, ',');
     Tokenizer::const_iterator iter = tokens.begin();
-    uint8 size = tokens.size();
+
+    size_t size = tokens.size();
     std::string name = appenderName.substr(9);
 
     if (size < 2)
@@ -87,8 +89,9 @@ void Log::CreateAppenderFromConfig(std::string const& appenderName)
     }
 
     AppenderFlags flags = APPENDER_FLAGS_NONE;
-    AppenderType type = AppenderType(atoi(*iter));
-    LogLevel level = LogLevel(atoi(*(++iter)));
+    AppenderType type = AppenderType(atoi(*iter++));
+    LogLevel level = LogLevel(atoi(*iter++));
+
     if (level > LOG_LEVEL_FATAL)
     {
         fprintf(stderr, "Log::CreateAppenderFromConfig: Wrong Log Level %d for appender %s\n", level, name.c_str());
@@ -96,7 +99,7 @@ void Log::CreateAppenderFromConfig(std::string const& appenderName)
     }
 
     if (size > 2)
-        flags = AppenderFlags(atoi(*(++iter)));
+        flags = AppenderFlags(atoi(*iter++));
 
     switch (type)
     {
@@ -105,7 +108,7 @@ void Log::CreateAppenderFromConfig(std::string const& appenderName)
             AppenderConsole* appender = new AppenderConsole(NextAppenderId(), name, level, flags);
             appenders[appender->getId()] = appender;
             if (size > 3)
-                appender->InitColors(*(++iter));
+                appender->InitColors(*iter++);
             //fprintf(stdout, "Log::CreateAppenderFromConfig: Created Appender %s (%u), Type CONSOLE, Mask %u\n", appender->getName().c_str(), appender->getId(), appender->getLogLevel());
             break;
         }
@@ -120,10 +123,10 @@ void Log::CreateAppenderFromConfig(std::string const& appenderName)
                 return;
             }
 
-            filename = *(++iter);
+            filename = *iter++;
 
             if (size > 4)
-                mode = *(++iter);
+                mode = *iter++;
 
             if (flags & APPENDER_FLAGS_USE_TIMESTAMP)
             {
@@ -136,7 +139,7 @@ void Log::CreateAppenderFromConfig(std::string const& appenderName)
 
             uint64 maxFileSize = 0;
             if (size > 5)
-                maxFileSize = atoi(*(++iter));
+                maxFileSize = atoi(*iter++);
 
             uint8 id = NextAppenderId();
             appenders[id] = new AppenderFile(id, name, level, filename.c_str(), m_logsDir.c_str(), mode.c_str(), flags, maxFileSize);
@@ -188,7 +191,7 @@ void Log::CreateLoggerFromConfig(std::string const& appenderName)
         return;
     }
 
-    level = LogLevel(atoi(*iter));
+    level = LogLevel(atoi(*iter++));
     if (level > LOG_LEVEL_FATAL)
     {
         fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong Log Level %u for logger %s\n", type, name.c_str());
@@ -198,7 +201,6 @@ void Log::CreateLoggerFromConfig(std::string const& appenderName)
     logger.Create(name, level);
     //fprintf(stdout, "Log::CreateLoggerFromConfig: Created Logger %s, Level %u\n", name.c_str(), level);
 
-    ++iter;
     std::istringstream ss(*iter);
     std::string str;
 
@@ -320,67 +322,8 @@ bool Log::SetLogLevel(std::string const& name, const char* newLevelc, bool isLog
 
         appender->setLogLevel(newLevel);
     }
-    return true;
-}
-
-void Log::outTrace(std::string const& filter, const char * str, ...)
-{
-    va_list ap;
-    va_start(ap, str);
 
-    vlog(filter, LOG_LEVEL_TRACE, str, ap);
-
-    va_end(ap);
-}
-
-void Log::outDebug(std::string const& filter, const char * str, ...)
-{
-    va_list ap;
-    va_start(ap, str);
-
-    vlog(filter, LOG_LEVEL_DEBUG, str, ap);
-
-    va_end(ap);
-}
-
-void Log::outInfo(std::string const& filter, const char * str, ...)
-{
-    va_list ap;
-    va_start(ap, str);
-
-    vlog(filter, LOG_LEVEL_INFO, str, ap);
-
-    va_end(ap);
-}
-
-void Log::outWarn(std::string const& filter, const char * str, ...)
-{
-    va_list ap;
-    va_start(ap, str);
-
-    vlog(filter, LOG_LEVEL_WARN, str, ap);
-
-    va_end(ap);
-}
-
-void Log::outError(std::string const& filter, const char * str, ...)
-{
-    va_list ap;
-    va_start(ap, str);
-
-    vlog(filter, LOG_LEVEL_ERROR, str, ap);
-
-    va_end(ap);
-}
-
-void Log::outFatal(std::string const& filter, const char * str, ...)
-{
-    va_list ap;
-    va_start(ap, str);
-
-    vlog(filter, LOG_LEVEL_FATAL, str, ap);
-
-    va_end(ap);
+    return true;
 }
 
 void Log::outCharDump(char const* str, uint32 accountId, uint32 guid, char const* name)
@@ -453,6 +396,7 @@ void Log::LoadFromConfig()
     if (!m_logsDir.empty())
         if ((m_logsDir.at(m_logsDir.length() - 1) != '/') && (m_logsDir.at(m_logsDir.length() - 1) != '\\'))
             m_logsDir.push_back('/');
+
     ReadAppendersFromConfig();
     ReadLoggersFromConfig();
 }
-- 
cgit v1.2.3