nostr/strfry
1
0
Fork 0
mirror of https://github.com/hoytech/strfry.git synced 2025-06-17 00:38:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

in router, ensure the configured timeout is installed for first connections

Browse Source
This commit is contained in:
Doug Hoyte
2025-01-10 16:35:24 -05:00
parent d910fb203c
commit 85a2b875a3
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/apps/mesh/cmd_router.cpp
View File

@ -297,6 +297,20 @@ struct Router {
try { try {
auto routerConfig = loadRawTaoConfig(routerConfigFile); 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()) { for (const auto &[groupName, spec] : routerConfig.at("streams").get_object()) {
if (!streamGroups.contains(groupName)) { if (!streamGroups.contains(groupName)) {
LI << "New stream group [" << 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, spec] : routerConfig.at("streams").get_object()) unneededGroups.erase(groupName);
for (const auto &groupName : unneededGroups) streamGroups.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) { } catch (std::exception &e) {
LE << "Failed to parse router config: " << e.what(); LE << "Failed to parse router config: " << e.what();
if (!firstConfigLoadSuccess) ::exit(1); if (!firstConfigLoadSuccess) ::exit(1);