From a47d646eb5daaa0db0b694f4c41e63154a2abb25 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Wed, 1 Dec 2010 17:21:05 +0100 Subject: [PATCH] Make LogLevel::Emergency and LogLevel::Alert usable. Add upper log level limit --- src/logfunc.cpp | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) 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) -- 1.7.1