Renamed stable-link-up-interval to link-up-interval

diff --git a/Readme b/Readme
index 5dda988..947ee02 100644 (file)
--- a/Readme
+++ b/Readme
@@ -176,7 +176,7 @@ This configurations are shared among and affect all the hosts.
 - status-notifier-cmd: the command line that is called when a host is down, or
   up. Accepted variables are:
     ${status} - down or up
-- stable-link-up-interval: how long (in minutes) the pings don't have to fail
+- link-up-interval: how long (in minutes) the pings don't have to fail
   in order to consider the link up, or stable.
 
 

diff --git a/conf/pingcheck.conf b/conf/pingcheck.conf
index e5c2d3c..f517b26 100644 (file)
--- a/conf/pingcheck.conf
+++ b/conf/pingcheck.conf
@@ -1,7 +1,7 @@
 hosts-down-limit=4
 ping-fail-limit=40
 status-notifier-cmd=./system_status_alert.sh ${status}
-stable-link-up-interval=10
+link-up-interval=10
 
 [host]
 name=www.intra2net.com

diff --git a/src/config/configuration.cpp b/src/config/configuration.cpp
index d362cfb..b0ca229 100644 (file)
--- a/src/config/configuration.cpp
+++ b/src/config/configuration.cpp
@@ -17,9 +17,9 @@ Configuration::Configuration() :
     MinPingFailLimit( 0 ),
     MaxPingFailLimit( 100 ),
     StatusNotifierCmd( "" ),
-    StableLinkUpInterval( 0 ),
-    MinStableLinkUpInterval( 0 ),
-    MaxStableLinkUpInterval( 60 ),
+    LinkUpInterval( 0 ),
+    MinStableLinkInterval( 0 ),
+    MaxStableLinkInterval( 60 ),
     Hosts()
 {
 }
@@ -47,7 +47,7 @@ int Configuration::get_hosts_down_limit() const
 
 void Configuration::set_hosts_down_limit( const int hosts_down_limit )
 {
-    BOOST_ASSERT( ( MinHostsDownLimit <= hosts_down_limit ) && ( hosts_down_limit <= MaxHostsDownLimit) );
+    BOOST_ASSERT( ( MinHostsDownLimit <= hosts_down_limit ) && ( hosts_down_limit <= MaxHostsDownLimit ) );
 
     this->HostsDownLimit = hosts_down_limit;
 }
@@ -59,6 +59,8 @@ int Configuration::get_ping_fail_limit() const
 
 void Configuration::set_ping_fail_limit( const int ping_fail_limit )
 {
+    BOOST_ASSERT( ( MinPingFailLimit <= ping_fail_limit ) && ( ping_fail_limit <= MaxPingFailLimit ) );
+
     PingFailLimit = ping_fail_limit;
 }
 
@@ -74,14 +76,16 @@ void Configuration::set_status_notifier_cmd( const string &status_notifier_cmd )
     StatusNotifierCmd = status_notifier_cmd;
 }
 
-int Configuration::get_stable_link_up_interval() const
+int Configuration::get_link_up_interval() const
 {
-    return StableLinkUpInterval;
+    return LinkUpInterval;
 }
 
-void Configuration::set_stable_link_up_interval( const int stable_link_up_interval )
+void Configuration::set_link_up_interval( const int link_up_interval )
 {
-    StableLinkUpInterval = stable_link_up_interval;
+    BOOST_ASSERT( ( MinStableLinkInterval <= link_up_interval ) && ( link_up_interval <= MaxStableLinkInterval ) );
+
+    LinkUpInterval = link_up_interval;
 }
 
 vector< HostItem > Configuration::get_hosts() const

diff --git a/src/config/configuration.h b/src/config/configuration.h
index 4a65af9..0bb273f 100644 (file)
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -30,8 +30,8 @@ public:
     std::string get_status_notifier_cmd() const;
     void set_status_notifier_cmd( const std::string &status_notifier_cmd );
 
-    int get_stable_link_up_interval() const;
-    void set_stable_link_up_interval( const int stable_link_up_interval );
+    int get_link_up_interval() const;
+    void set_link_up_interval( const int link_up_interval );
 
     std::vector<HostItem> get_hosts() const;
     void set_hosts( const std::vector<HostItem> &hosts_list );
@@ -45,9 +45,9 @@ private:
     const int MinPingFailLimit;
     const int MaxPingFailLimit;
     std::string StatusNotifierCmd;
-    int StableLinkUpInterval;
-    const int MinStableLinkUpInterval;
-    const int MaxStableLinkUpInterval;
+    int LinkUpInterval;
+    const int MinStableLinkInterval;
+    const int MaxStableLinkInterval;
     std::vector<HostItem> Hosts;
 
 };

diff --git a/src/config/configurationreader.cpp b/src/config/configurationreader.cpp
index 20de0eb..08e9d22 100644 (file)
--- a/src/config/configurationreader.cpp
+++ b/src/config/configurationreader.cpp
@@ -31,9 +31,9 @@ ConfigurationReader::ConfigurationReader() :
     PingFailLimitCmdDesc( "Maximum percentage of pings that can fail for a given host." ),
     StatusNotifierCmdCmdStr( "status-notifier-cmd" ),
     StatusNotifierCmdCmdDesc( "The command to execute to alert about host status." ),
-    DefaultStableLinkUpInterval( 5 ), // 5 minutes
-    StableLinkUpIntervalCmdStr( "stable-link-up-interval" ),
-    StableLinkUpIntervalCmdDesc( "How long the link must be responsive in order to consider it stable" ),
+    DefaultLinkUpInterval( 5 ), // 5 minutes
+    LinkUpIntervalCmdStr( "link-up-interval" ),
+    LinkUpIntervalCmdDesc( "How long the link must be responsive in order to consider it stable." ),
     HostNameCmdStr( "host.name" ),
     HostNameCmdDesc( "Host address" ),
     DefaultHostInterval( 60 ), // 60 seconds
@@ -120,7 +120,7 @@ options_description ConfigurationReader::get_configuration_options() const
         ( HostsDownLimitCmdStr.c_str(), value<int>()->default_value( DefaultHostsDownLimit ), HostsDownLimitCmdDesc.c_str() )
         ( PingFailLimitCmdStr.c_str(), value<int>()->default_value( DefaultPingFailLimit ), PingFailLimitCmdDesc.c_str() )
         ( StatusNotifierCmdCmdStr.c_str(), value<string>(), StatusNotifierCmdCmdDesc.c_str() )
-        ( StableLinkUpIntervalCmdStr.c_str(), value<int>()->default_value( DefaultStableLinkUpInterval ), StableLinkUpIntervalCmdDesc.c_str() )
+        ( LinkUpIntervalCmdStr.c_str(), value<int>()->default_value( DefaultLinkUpInterval ), LinkUpIntervalCmdDesc.c_str() )
         ( HostNameCmdStr.c_str(), value< vector<string> >(), HostNameCmdDesc.c_str() )
         ( HostIntervalCmdStr.c_str(), value< vector<int> >(), HostIntervalCmdDesc.c_str() )
     ;
@@ -167,13 +167,13 @@ bool ConfigurationReader::parse_configuration_options( const variables_map &vm )
         cout << StatusNotifierCmdCmdStr << "=" << status_notifier_cmd << endl;
     }
 
-    // stable-link-up-interval
-    if ( vm.count( StableLinkUpIntervalCmdStr ) )
+    // link-up-interval
+    if ( vm.count( LinkUpIntervalCmdStr ) )
     {
-        int stable_link_up_interval = vm[ StableLinkUpIntervalCmdStr ].as<int>();
-        Config.set_stable_link_up_interval( stable_link_up_interval );
+        int link_up_interval = vm[ LinkUpIntervalCmdStr ].as<int>();
+        Config.set_link_up_interval( link_up_interval );
 
-        cout << StableLinkUpIntervalCmdStr << "=" << stable_link_up_interval
+        cout << LinkUpIntervalCmdStr << "=" << link_up_interval
              << endl;
     }
 

diff --git a/src/config/configurationreader.h b/src/config/configurationreader.h
index d52c311..a431b5b 100644 (file)
--- a/src/config/configurationreader.h
+++ b/src/config/configurationreader.h
@@ -69,9 +69,9 @@ private:
     const std::string PingFailLimitCmdDesc;
     const std::string StatusNotifierCmdCmdStr;
     const std::string StatusNotifierCmdCmdDesc;
-    const int DefaultStableLinkUpInterval;
-    const std::string StableLinkUpIntervalCmdStr;
-    const std::string StableLinkUpIntervalCmdDesc;
+    const int DefaultLinkUpInterval;
+    const std::string LinkUpIntervalCmdStr;
+    const std::string LinkUpIntervalCmdDesc;
     const std::string HostNameCmdStr;
     const std::string HostNameCmdDesc;
     const int DefaultHostInterval;