in router, ensure the configured timeout is installed for first conne…

…ctions
hoytech · Jan 10, 2025 · 85a2b87 · 85a2b87
1 parent d910fb2
commit 85a2b87
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/apps/mesh/cmd_router.cpp b/src/apps/mesh/cmd_router.cpp
@@ -297,6 +297,20 @@ struct Router {
         try {
             auto routerConfig = loadRawTaoConfig(routerConfigFile);
 
+            // connectionTimeout
+
+            uint64_t newTimeoutUs = defaultConnectionTimeoutUs;
+            if (routerConfig.get_object().contains("connectionTimeout")) {
+                newTimeoutUs = routerConfig.at("connectionTimeout").get_unsigned() * 1'000'000;
+            }
+
+            if (connectionTimeoutUs != newTimeoutUs) {
+                connectionTimeoutUs = newTimeoutUs;
+                LI << "Using connection timeout: " << (connectionTimeoutUs / 1'000'000) << " seconds";
+            }
+
+            // load streamGroups
+
             for (const auto &[groupName, spec] : routerConfig.at("streams").get_object()) {
                 if (!streamGroups.contains(groupName)) {
                     LI << "New stream group [" << groupName << "]";
@@ -314,18 +328,6 @@ struct Router {
                 for (const auto &[groupName, spec] : routerConfig.at("streams").get_object()) unneededGroups.erase(groupName);
                 for (const auto &groupName : unneededGroups) streamGroups.erase(groupName);
             }
-
-            // connectionTimeout
-
-            uint64_t newTimeoutUs = defaultConnectionTimeoutUs;
-            if (routerConfig.get_object().contains("connectionTimeout")) {
-                newTimeoutUs = routerConfig.at("connectionTimeout").get_unsigned() * 1'000'000;
-            }
-
-            if (connectionTimeoutUs != newTimeoutUs) {
-                connectionTimeoutUs = newTimeoutUs;
-                LI << "Using connection timeout: " << (connectionTimeoutUs / 1'000'000) << " seconds";
-            }
         } catch (std::exception &e) {
             LE << "Failed to parse router config: " << e.what();
             if (!firstConfigLoadSuccess) ::exit(1);