Init bridge reconnect timer from reloadTimers()

This fixes the bridge reconnect timer stopping when you change the save
state interval or plugin periodic events and send a SIGHUP.

Author: halfgaar

mainapp.cpp

@@ -382,7 +382,7 @@ void MainApp::sendBridgesToThreads()
     }
 }
 
-void MainApp::queueBridgeReconnectAllThreads(bool alsoQueueNexts)
+void MainApp::queueBridgeReconnectAllThreads()
 {
     try
     {
@@ -396,12 +396,6 @@ void MainApp::queueBridgeReconnectAllThreads(bool alsoQueueNexts)
         Logger *logger = Logger::getInstance();
         logger->logf(LOG_ERR, ex.what());
     }
-
-    if (alsoQueueNexts)
-    {
-        auto fReconnectBridges = std::bind(&MainApp::queueBridgeReconnectAllThreads, this, false);
-        timed_tasks.addTask(fReconnectBridges, 5000, true);
-    }
 }
 
 void MainApp::queueInternalHeartbeat()
@@ -670,7 +664,7 @@ void MainApp::start()
     }
 
     sendBridgesToThreads();
-    queueBridgeReconnectAllThreads(true);
+    queueBridgeReconnectAllThreads();
 
     std::minstd_rand randomish;
     randomish.seed(get_random_int<unsigned long>());
@@ -1100,7 +1094,7 @@ void MainApp::loadConfig(bool reload)
         if (reload)
         {
             sendBridgesToThreads();
-            queueBridgeReconnectAllThreads(false);
+            queueBridgeReconnectAllThreads();
         }
     }
 
@@ -1225,6 +1219,15 @@ void MainApp::reloadTimers(bool reload, const Settings &old_settings)
         auto fInternalHeartbeat = std::bind(&MainApp::queueInternalHeartbeat, this);
         timed_tasks.addTask(fInternalHeartbeat, HEARTBEAT_INTERVAL, true);
     }
+
+    {
+        uint32_t interval = 5000;
+#ifdef TESTING
+        interval = 1000;
+#endif
+        auto fReconnectBridges = std::bind(&MainApp::queueBridgeReconnectAllThreads, this);
+        timed_tasks.addTask(fReconnectBridges, interval, true);
+    }
 }
 
 /**

mainapp.h

@@ -96,7 +96,7 @@ class MainApp
     void waitForWillsQueued();
     void queueRetainedMessageExpiration();
     void sendBridgesToThreads();
-    void queueBridgeReconnectAllThreads(bool alsoQueueNexts);
+    void queueBridgeReconnectAllThreads();
     void queueInternalHeartbeat();
 
     MainApp(const std::string &configFilePath);