Changeset 874 for cpp/common/loggers

Timestamp:

05/05/19 06:21:06 (6 years ago)

Author:

Maciej Komosinski

Message:

Introduced a function logLevelName() to avoid potential errors, e.g. forgetting "+1" in LOG_LEVEL[level+1]

Location:

cpp/common/loggers

Files:

• loggers.cpp (modified) (3 diffs)
• loggertostdout.cpp (modified) (3 diffs)

cpp/common/loggers/loggers.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -148 +148 @@
                         {
                                 if (msgs.length() > 0) msgs += '\n';
-                                msgs += ssprintf(LOG_FORMAT, LOG_LEVEL[level + 1], obj, method, msg);
+                                msgs += ssprintf(LOG_FORMAT, logLevelName(level), obj, method, msg);
                         }
                 }
@@ -170 +170 @@
         return string("");
 }
-

cpp/common/loggers/loggertostdout.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -15 +15 @@
 
 const char** LoggerToStdout::default_log_level[] =
-{ LOG_LEVEL, default_log_level_ansicolor };
+{ LOG_LEVEL_ARRAY, default_log_level_ansicolor };
 
 const char* LoggerToStdout::default_log_format[] = //note trailing %s (so it's easy to append "\n" later)
@@ -29 +29 @@
 void LoggerToStdout::handleSingleLine(const char *obj, const char *method, int level, const char *msg)
 {
-        if (level < -1) level = -1; else if (level>3) level = 3;
 #ifdef SHP
-        AppLog(LOG_FORMAT "\n",LOG_LEVEL[level+1],obj,method,msg);
+        AppLog(LOG_FORMAT "\n", logLevelName(level), obj, method, msg);
 #else
         if (file)
-                file->printf(LOG_FORMAT "\n", LOG_LEVEL[level + 1], obj, method, msg);
+                file->printf(LOG_FORMAT "\n", logLevelName(level), obj, method, msg);
         else
+        {
+                if (level < -1) level = -1; else if (level > 3) level = 3;
                 printf(log_format, log_level[level + 1], obj, method, msg, "\n");
+        }
 #endif
 }