void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 20:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
controller/PostgreSQL.cpp
View file

@ -1014,12 +1014,16 @@ void PostgreSQL::heartbeat()
} }
_pool->unborrow(c); _pool->unborrow(c);
if (_redisMemberStatus) { try {
if (_rc->clusterMode) { if (_redisMemberStatus) {
_cluster->zadd("controllers", "controllerId", ts); if (_rc->clusterMode) {
} else { _cluster->zadd("controllers", "controllerId", ts);
_redis->zadd("controllers", "controllerId", ts); } else {
_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));