Fix: using libi2ncommon LogLevel.

diff --git a/src/config/configuration.cpp b/src/config/configuration.cpp
index 7c63485..17145db 100644 (file)
--- a/src/config/configuration.cpp
+++ b/src/config/configuration.cpp
@@ -22,6 +22,7 @@ on this file might be covered by the GNU General Public License.
 #include <boost/assert.hpp>
 
 using namespace std;
+using I2n::Logger::LogLevel;
 
 //-----------------------------------------------------------------------------
 // Configuration
@@ -29,7 +30,7 @@ using namespace std;
 
 Configuration::Configuration() :
     Daemon( false ),
-    LoggingLevel( LogLevel_ERROR ),
+    LoggingLevel( LogLevel::Error ),
     ConfigFileName( "" ),
     SourceNetworkInterface( "" ),
     NameServer( "" ),
@@ -69,7 +70,7 @@ LogLevel Configuration::get_log_level() const
 
 void Configuration::set_log_level( const LogLevel &log_level )
 {
-    BOOST_ASSERT( (LogLevel_First <= log_level) && (log_level <= LogLevel_Last) );
+    BOOST_ASSERT( (LogLevel::Emergency <= log_level) && (log_level <= LogLevel::Debug) );
 
     this->LoggingLevel = log_level;
 }

diff --git a/src/config/configuration.h b/src/config/configuration.h
index 061dff9..13ddc15 100644 (file)
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -27,6 +27,7 @@ on this file might be covered by the GNU General Public License.
 
 #include <boost/shared_ptr.hpp>
 
+#include "logfunc.hpp"
 #include "config/host.h"
 #include "host/loglevel.h"
 
@@ -49,8 +50,8 @@ public:
     std::string get_config_file_name() const;
     void set_config_file_name( const std::string &config_file_name );
 
-    LogLevel get_log_level() const;
-    void set_log_level( const LogLevel &log_level );
+    I2n::Logger::LogLevel get_log_level() const;
+    void set_log_level( const I2n::Logger::LogLevel &log_level );
 
     std::string get_nameserver() const;
     void set_nameserver( const std::string &nameserver );
@@ -80,7 +81,7 @@ public:
 
 private:
     bool Daemon;
-    LogLevel LoggingLevel;
+    I2n::Logger::LogLevel LoggingLevel;
     std::string ConfigFileName;
     std::string SourceNetworkInterface;
     std::string NameServer;

diff --git a/src/config/option/logleveloption.cpp b/src/config/option/logleveloption.cpp
index 935cbe3..0af4670 100644 (file)
--- a/src/config/option/logleveloption.cpp
+++ b/src/config/option/logleveloption.cpp
@@ -24,11 +24,13 @@
 
 #include <logfunc.hpp>
 
+#include "logfunc.hpp"
 #include "host/loglevel.h"
 
 using namespace std;
 using boost::program_options::value;
 using boost::program_options::variables_map;
+using I2n::Logger::LogLevel;
 using I2n::Logger::GlobalLogger;
 
 //-----------------------------------------------------------------------------

diff --git a/src/host/loglevel.cpp b/src/host/loglevel.cpp
index a396011..44eaf91 100644 (file)
--- a/src/host/loglevel.cpp
+++ b/src/host/loglevel.cpp
@@ -26,6 +26,7 @@ on this file might be covered by the GNU General Public License.
 #include <boost/assert.hpp>
 
 using namespace std;
+using I2n::Logger::LogLevel;
 
 static map<string, LogLevel> log_level_string_map;
 
@@ -40,14 +41,14 @@ LogLevel get_log_level_from_string( const string & log_level_string )
                ::toupper );
 
     // TODO move to an init method
-    log_level_string_map[ "DEBUG" ] = LogLevel_DEBUG;
-    log_level_string_map[ "INFO" ] = LogLevel_INFO;
-    log_level_string_map[ "NOTICE" ] = LogLevel_NOTICE;
-    log_level_string_map[ "WARNING" ] = LogLevel_WARNING;
-    log_level_string_map[ "ERROR" ] = LogLevel_ERROR;
-    log_level_string_map[ "CRITICAL" ] = LogLevel_CRITICAL;
-    log_level_string_map[ "ALERT" ] = LogLevel_ALERT;
-    log_level_string_map[ "EMERGENCY" ] = LogLevel_EMERGENCY;
+    log_level_string_map[ "DEBUG" ] = LogLevel::Debug;
+    log_level_string_map[ "INFO" ] = LogLevel::Info;
+    log_level_string_map[ "NOTICE" ] = LogLevel::Notice;
+    log_level_string_map[ "WARNING" ] = LogLevel::Warning;
+    log_level_string_map[ "ERROR" ] = LogLevel::Error;
+    log_level_string_map[ "CRITICAL" ] = LogLevel::Critical;
+    log_level_string_map[ "ALERT" ] = LogLevel::Alert;
+    log_level_string_map[ "EMERGENCY" ] = LogLevel::Emergency;
 
     LogLevel log_level = log_level_string_map[ log_level_uppercase_string ];
 

diff --git a/src/host/loglevel.h b/src/host/loglevel.h
index 280e780..83a9434 100644 (file)
--- a/src/host/loglevel.h
+++ b/src/host/loglevel.h
@@ -23,20 +23,8 @@
 
 #include <string>
 
-enum LogLevel
-{
-    LogLevel_First = 0,
-    LogLevel_DEBUG = LogLevel_First,
-    LogLevel_INFO,
-    LogLevel_NOTICE,
-    LogLevel_WARNING,
-    LogLevel_ERROR,
-    LogLevel_CRITICAL,
-    LogLevel_ALERT,
-    LogLevel_EMERGENCY,
-    LogLevel_Last = LogLevel_EMERGENCY
-};
-
-LogLevel get_log_level_from_string( const std::string & log_level_string );
+#include "logfunc.hpp"
+
+I2n::Logger::LogLevel get_log_level_from_string( const std::string & log_level_string );
 
 #endif // LOG_LEVEL_H

diff --git a/test/test_configurationoptions.cpp b/test/test_configurationoptions.cpp
index e770429..be8dbb3 100644 (file)
--- a/test/test_configurationoptions.cpp
+++ b/test/test_configurationoptions.cpp
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE( parse_generic_options )
 
     BOOST_CHECK_EQUAL( configuration.get_config_file_name(), "pingcheck.conf" );
     BOOST_CHECK_EQUAL( configuration.get_daemon(), true );
-    BOOST_CHECK_EQUAL( configuration.get_log_level(), LogLevel_EMERGENCY );
+    BOOST_CHECK_EQUAL( configuration.get_log_level(), I2n::Logger::LogLevel::Emergency );
 }
 
 BOOST_AUTO_TEST_CASE( parse_configuration_options )

diff --git a/test/test_loglevel.cpp b/test/test_loglevel.cpp
index 7499073..b289619 100644 (file)
--- a/test/test_loglevel.cpp
+++ b/test/test_loglevel.cpp
@@ -23,56 +23,59 @@ on this file might be covered by the GNU General Public License.
 
 #include <boost/test/unit_test.hpp>
 
+#include "logfunc.hpp"
 #include "host/loglevel.h"
 
+using I2n::Logger::LogLevel;
+
 BOOST_AUTO_TEST_SUITE( TestLogLevel )
 
 BOOST_AUTO_TEST_CASE( lowercase )
 {
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "debug" ), LogLevel_DEBUG );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "info" ), LogLevel_INFO );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "notice" ), LogLevel_NOTICE );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "warning" ), LogLevel_WARNING );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "error" ), LogLevel_ERROR );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "critical" ), LogLevel_CRITICAL );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "alert" ), LogLevel_ALERT );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "emergency" ), LogLevel_EMERGENCY );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "debug" ), LogLevel::Debug );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "info" ), LogLevel::Info );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "notice" ), LogLevel::Notice );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "warning" ), LogLevel::Warning );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "error" ), LogLevel::Error );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "critical" ), LogLevel::Critical );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "alert" ), LogLevel::Alert );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "emergency" ), LogLevel::Emergency );
 }
 
 BOOST_AUTO_TEST_CASE( uppercase )
 {
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "DEBUG" ), LogLevel_DEBUG );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "INFO" ), LogLevel_INFO );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "NOTICE" ), LogLevel_NOTICE );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "WARNING" ), LogLevel_WARNING );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "ERROR" ), LogLevel_ERROR );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "CRITICAL" ), LogLevel_CRITICAL );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "ALERT" ), LogLevel_ALERT );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "EMERGENCY" ), LogLevel_EMERGENCY );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "DEBUG" ), LogLevel::Debug );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "INFO" ), LogLevel::Info );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "NOTICE" ), LogLevel::Notice );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "WARNING" ), LogLevel::Warning );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "ERROR" ), LogLevel::Error );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "CRITICAL" ), LogLevel::Critical );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "ALERT" ), LogLevel::Alert );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "EMERGENCY" ), LogLevel::Emergency );
 }
 
 BOOST_AUTO_TEST_CASE( mixed_case )
 {
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "DeBuG" ), LogLevel_DEBUG );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "InfO" ), LogLevel_INFO );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "NoTicE" ), LogLevel_NOTICE );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "warNing" ), LogLevel_WARNING );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "errOR" ), LogLevel_ERROR );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "critiCaL" ), LogLevel_CRITICAL );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "aleRt" ), LogLevel_ALERT );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "EmerGENCy" ), LogLevel_EMERGENCY );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "DeBuG" ), LogLevel::Debug );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "InfO" ), LogLevel::Info );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "NoTicE" ), LogLevel::Notice );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "warNing" ), LogLevel::Warning );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "errOR" ), LogLevel::Error );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "critiCaL" ), LogLevel::Critical );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "aleRt" ), LogLevel::Alert );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "EmerGENCy" ), LogLevel::Emergency );
 }
 
 BOOST_AUTO_TEST_CASE( misspelled )
 {
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "when" ), LogLevel_DEBUG );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "the" ), LogLevel_DEBUG );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "word" ), LogLevel_DEBUG );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "is" ), LogLevel_DEBUG );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "wrong" ), LogLevel_DEBUG );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "stick" ), LogLevel_DEBUG );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "to" ), LogLevel_DEBUG );
-    BOOST_CHECK_EQUAL( get_log_level_from_string( "DEBUG" ), LogLevel_DEBUG );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "when" ), LogLevel::Warning );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "the" ), LogLevel::Warning );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "word" ), LogLevel::Warning );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "is" ), LogLevel::Warning );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "wrong" ), LogLevel::Warning );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "stick" ), LogLevel::Warning );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "to" ), LogLevel::Warning );
+    BOOST_CHECK_EQUAL( get_log_level_from_string( "WARNING" ), LogLevel::Warning );
 }
 
 BOOST_AUTO_TEST_SUITE_END()