ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-15 13:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't crash out of the controller heartbeat loop here

Browse Source
This commit is contained in:
Grant Limberg
2022-06-30 11:40:04 -07:00
parent b5d7d71e1e
commit 9cf8dacfbb
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controller/PostgreSQL.cpp
View File

@ -1014,6 +1014,7 @@ void PostgreSQL::heartbeat()
} }
_pool->unborrow(c); _pool->unborrow(c);
try {
if (_redisMemberStatus) { if (_redisMemberStatus) {
if (_rc->clusterMode) { if (_rc->clusterMode) {
_cluster->zadd("controllers", "controllerId", ts); _cluster->zadd("controllers", "controllerId", ts);
@ -1021,6 +1022,9 @@ void PostgreSQL::heartbeat()
_redis->zadd("controllers", "controllerId", ts); _redis->zadd("controllers", "controllerId", ts);
} }
} }
} catch (sw::redis::Error &e) {
fprintf(stderr, "ERROR: Redis error in heartbeat thread: %s\n", e.what());
}
std::this_thread::sleep_for(std::chrono::milliseconds(1000)); std::this_thread::sleep_for(std::chrono::milliseconds(1000));
} }