From 4475e30a69c8367c99d2aea78b041fba82f12642 Mon Sep 17 00:00:00 2001
From: Bjoern Sikora <bjoern.sikora@intra2net.com>
Date: Fri, 21 May 2010 17:01:46 +0200
Subject: [PATCH] Bugfix in ExternalLogOnlyOnce. Set the right member ;-).

---
 src/config.cpp |    6 ++++--
 src/logger.cpp |   15 ++++++++++++++-
 src/logger.h   |    6 +++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index e0de096..440c75e 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -54,6 +54,7 @@ Config::Config()
     , ExternalWarningLevel(0)
     , StartOffline(false)
     , WebcheckEnabled(false)
+    , ExternalLogOnlyOnce(false)
 {
     // Available service description config options
     po::options_description opt_desc_service("Service description options");
@@ -128,6 +129,7 @@ Config::Config(Logger::Ptr _log, Serviceholder::Ptr _serviceholder)
     , ExternalWarningLevel(0)
     , StartOffline(false)
     , WebcheckEnabled(false)
+    , ExternalLogOnlyOnce(false)
 {
     // Available service description config options
     po::options_description opt_desc_service("Service description options");
@@ -317,7 +319,7 @@ int Config::parse_cmd_line(int argc, char *argv[])
             ExternalWarningLevel = VariablesMap["external_warning_level"].as<int>();
 
         if ( VariablesMap.count("external_log_only_once") )
-            StartOffline = VariablesMap["external_log_only_once"].as<bool>();
+            ExternalLogOnlyOnce = VariablesMap["external_log_only_once"].as<bool>();
 
         if ( VariablesMap.count("start_offline") )
             StartOffline = VariablesMap["start_offline"].as<bool>();
@@ -578,7 +580,7 @@ int Config::load_main_config_file(const string& full_filename)
                 ExternalWarningLevel = VariablesMap["external_warning_level"].as<int>();
 
             if ( VariablesMap.count("external_log_only_once") )
-                StartOffline = VariablesMap["external_log_only_once"].as<bool>();
+                ExternalLogOnlyOnce = VariablesMap["external_log_only_once"].as<bool>();
 
             if ( VariablesMap.count("start_offline") )
                 StartOffline = VariablesMap["start_offline"].as<bool>();
diff --git a/src/logger.cpp b/src/logger.cpp
index 7c05478..d6b4f6b 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -668,7 +668,7 @@ void Logger::print_init_log_facility() const
     if ( level <= Loglevel )
     {
         ostringstream msg;
-        msg << "Initialized logging facility." << " Loglevel: " << Loglevel << " Syslog: " << Syslog << endl;
+        msg << "Initialized logging facility." << " Loglevel: " << Loglevel << " Syslog: " << Syslog << " ExternalLogOnlyOnce: " << ExternalLogOnlyOnce << endl;
         log_notice(msg.str());
     }
 }
@@ -1788,3 +1788,16 @@ void Logger::print_invalid_service_config() const
         log_error("Ignoring invalid service. Please check.\n");
     }
 }
+
+
+/**
+ * Print simple message.
+ */
+void Logger::print_msg( const string& msg ) const
+{
+    int level = 0;
+    if ( level <= Loglevel )
+    {
+        log_error(msg);
+    }
+}
diff --git a/src/logger.h b/src/logger.h
index ba1ea6c..d5ae694 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -58,6 +58,10 @@ public:
 
     void set_log_facility(const int _loglevel, const bool _syslog, const std::string& _external_error_log, const int _external_error_level, const bool _external_log_only_once );
 
+    bool is_allowed_to_send( const std::string& msg ) const;
+
+    // Start log messages.
+
     void print_usage(const boost::shared_ptr<boost::program_options::options_description> opt_desc) const;
 
     void print_version() const;
@@ -254,7 +258,7 @@ public:
 
     void print_invalid_service_config() const;
 
-    bool is_allowed_to_send( const std::string& msg ) const;
+    void print_msg( const std::string& msg ) const;
 };
 
 #endif
-- 
1.7.1