Make LogLevel::Emergency and LogLevel::Alert usable. Add upper log level limit
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 1 Dec 2010 16:21:05 +0000 (17:21 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 1 Dec 2010 16:21:05 +0000 (17:21 +0100)
src/logfunc.cpp

index 15c696f..1a719a2 100644 (file)
@@ -700,9 +700,17 @@ void reopen()
  */
 int set_log_level(int level)
 {
-    int result = g_max_level;
-    g_max_level = std::max( LOG_CRIT, level );
-    return result;
+    int previous = g_max_level;
+
+    // Sanity check
+    if (level < LogLevel::Emergency)
+      level = LogLevel::Emergency;
+    else if (level > LogLevel::Debug)
+      level = LogLevel::Debug;
+
+    g_max_level = level;
+
+    return previous;
 } // eo set_log_level(int)