Fix 'occurred' typo

[bpdyndnsd] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 715d06d..4fcf1ed 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,11 +26,11 @@
 using namespace std;
 
 Updater::Ptr updater;
-volatile bool exit_now = false;
 volatile bool caught_sig_hup = false;
 volatile bool caught_sig_usr1 = false;
 volatile bool caught_sig_usr2 = false;
 volatile bool caught_sig_rtmin = false;
+volatile bool caught_sig_rtmax = false;
 volatile bool caught_sig_term = false;
 
 /**
@@ -156,7 +156,7 @@ void sigusr1_func(int param)
 
 
 /**
- * Signal SIGHUP caught (reload config)
+ * Signal SIGHUP caught (reload config and reset log level)
  * @param param Parameter from the signal interface.
  */
 void sighup_func(int param)
@@ -186,6 +186,16 @@ void sigrtmin_func(int param)
 
 
 /**
+ * Signal SIGRTMAX caught (increase log level)
+ * @param param Parameter from the signal interface.
+ */
+void sigrtmax_func(int param)
+{
+    caught_sig_rtmax = true;
+} /*lint !e715 */
+
+
+/**
  * Initialize the signals we handle.
  * @return 0 if all is fine, -1 on error.
  */
@@ -222,6 +232,12 @@ int init_signals()
         updater->get_logger()->print_error_setting_signal("SIGRTMIN");
         return -1;
     }
+    ret_val = signal(SIGRTMAX, sigrtmax_func);
+    if ( ret_val == SIG_ERR )
+    {
+        updater->get_logger()->print_error_setting_signal("SIGRTMAX");
+        return -1;
+    }
 
     return 0;
 }
@@ -277,6 +293,18 @@ int init_daemon_mode(bool daemon_mode)
 }
 
 /**
+ * Calculate how long the dialup mode burst period will last (dialup mode only)
+ * @return Timestamp until dialup period lasts or zero if dialup mode is disabled
+*/
+time_t calc_dialup_mode_burst_period()
+{
+    if (updater->get_config()->get_dialup_mode() )
+        return time(NULL) + updater->get_config()->get_dialup_burst_period_seconds();
+
+    return 0;
+}
+
+/**
  * @brief The main part.
  * @param argc Number of arguments
  * @param argv Command line arguments
@@ -304,13 +332,24 @@ int main(int argc, char *argv[])
         return -1;
 
     // Should we start in offline mode?
+    bool old_online_state = false;
     bool is_online = !updater->get_config()->get_start_offline();
     bool webcheck_enabled = updater->get_config()->get_webcheck_enabled();
+    bool exit_now = false;
 
     // One shot run if daemon mode is disabled
     if (updater->get_config()->get_daemon_mode() != 1)
         exit_now = true;
 
+    // Tell the world we are running
+    updater->get_logger()->print_started();
+
+    int original_log_level = updater->get_logger()->get_loglevel();
+
+    // Dialup mode: Sleep a specified number of seconds between network traffic
+    time_t dialup_mode_burst_mode_until = calc_dialup_mode_burst_period();
+    time_t dialup_mode_sleep_until = 0;
+
     // service processing starts here
     do
     {
@@ -330,6 +369,7 @@ int main(int argc, char *argv[])
             // Go online
             is_online = true;
             webcheck_enabled = false;
+            dialup_mode_burst_mode_until = calc_dialup_mode_burst_period();
         } else if (caught_sig_rtmin)
         {
             caught_sig_rtmin = false;
@@ -338,6 +378,15 @@ int main(int argc, char *argv[])
             // Go online - with webcheck
             is_online = true;
             webcheck_enabled = true;
+            dialup_mode_burst_mode_until = calc_dialup_mode_burst_period();
+        } else if (caught_sig_rtmax)
+        {
+            caught_sig_rtmax = false;
+
+            // Increase log level
+            int new_loglevel = updater->get_logger()->get_loglevel() + 1;
+            updater->get_logger()->print_caught_sigrtmax(new_loglevel);
+            updater->get_logger()->set_loglevel(new_loglevel);
         } else if (caught_sig_term)
         {
             caught_sig_term = false;
@@ -354,6 +403,12 @@ int main(int argc, char *argv[])
                 updater->get_logger()->print_conf_reload_failed_exit();
                 exit(-1);
             }
+
+            // Reset log level to startup log level in case it got elevated by SIGRTMAX
+            updater->get_logger()->set_loglevel(original_log_level);
+
+            // Reset dialup mode burst period on config reload
+            dialup_mode_burst_mode_until = calc_dialup_mode_burst_period();
         }
 
         // State handling
@@ -363,8 +418,16 @@ int main(int argc, char *argv[])
             if ( updater->get_config()->get_webcheck_enabled() != webcheck_enabled )    /*lint !e731 */
                 updater->get_config()->set_webcheck_enabled(webcheck_enabled);
 
-            // update all configured services
-            updater->update_services();
+            if (updater->get_config()->get_dialup_mode() == false ||
+                (time(NULL) > dialup_mode_sleep_until || time(NULL) < dialup_mode_burst_mode_until) )
+            {
+                // update all configured services
+                updater->update_services(is_online != old_online_state);
+
+                // Refresh sleep state (dialup mode only)
+                dialup_mode_sleep_until = time(NULL) + updater->get_config()->get_dialup_sleep_seconds();
+            } else
+                updater->get_logger()->print_sleep_dialup_mode(dialup_mode_sleep_until);
         }
         else
         {
@@ -372,6 +435,10 @@ int main(int argc, char *argv[])
             updater->get_logger()->print_offline_mode();
         }
 
+        // Keep old online state so we can determine
+        // if we switched from offline to online
+        old_online_state = is_online;
+
         // Snore, snore... don't hog the cpu if we are in daemon_mode.
         if ( !exit_now )
             sleep(10); /*lint !e534 */