From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Wed, 1 Dec 2010 16:21:05 +0000 (+0100)
Subject: Make LogLevel::Emergency and LogLevel::Alert usable. Add upper log level limit
X-Git-Tag: v2.6~96^2
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=a47d646eb5daaa0db0b694f4c41e63154a2abb25;p=libi2ncommon

Make LogLevel::Emergency and LogLevel::Alert usable. Add upper log level limit
---

diff --git a/src/logfunc.cpp b/src/logfunc.cpp
index 15c696f..1a719a2 100644
--- a/src/logfunc.cpp
+++ b/src/logfunc.cpp
@@ -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)