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

move begin/commit into try/catch block (#1932)

Browse source 
Thread was exiting in some cases
This commit is contained in:
Grant Limberg 2023-03-24 13:03:15 -07:00 • committed by GitHub
parent 4a85cf5e74
commit 03bd96d1d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
controller/PostgreSQL.cpp
View file

@ -1011,8 +1011,6 @@ void PostgreSQL::heartbeat()
int64_t ts = OSUtils::now(); int64_t ts = OSUtils::now();
if(c->c) { if(c->c) {
pqxx::work w{*c->c};
std::string major = std::to_string(ZEROTIER_ONE_VERSION_MAJOR); std::string major = std::to_string(ZEROTIER_ONE_VERSION_MAJOR);
std::string minor = std::to_string(ZEROTIER_ONE_VERSION_MINOR); std::string minor = std::to_string(ZEROTIER_ONE_VERSION_MINOR);
std::string rev = std::to_string(ZEROTIER_ONE_VERSION_REVISION); std::string rev = std::to_string(ZEROTIER_ONE_VERSION_REVISION);
@ -1023,21 +1021,25 @@ void PostgreSQL::heartbeat()
std::string redis_mem_status = (_redisMemberStatus) ? "true" : "false"; std::string redis_mem_status = (_redisMemberStatus) ? "true" : "false";
try { try {
pqxx::result res = w.exec0("INSERT INTO ztc_controller (id, cluster_host, last_alive, public_identity, v_major, v_minor, v_rev, v_build, host_port, use_redis, redis_member_status) " pqxx::work w{*c->c};
"VALUES ("+w.quote(controllerId)+", "+w.quote(hostname)+", TO_TIMESTAMP("+now+"::double precision/1000), "+
w.quote(publicIdentity)+", "+major+", "+minor+", "+rev+", "+build+", "+host_port+", "+use_redis+", "+redis_mem_status+") " pqxx::result res =
"ON CONFLICT (id) DO UPDATE SET cluster_host = EXCLUDED.cluster_host, last_alive = EXCLUDED.last_alive, " w.exec0("INSERT INTO ztc_controller (id, cluster_host, last_alive, public_identity, v_major, v_minor, v_rev, v_build, host_port, use_redis, redis_member_status) "
"public_identity = EXCLUDED.public_identity, v_major = EXCLUDED.v_major, v_minor = EXCLUDED.v_minor, " "VALUES ("+w.quote(controllerId)+", "+w.quote(hostname)+", TO_TIMESTAMP("+now+"::double precision/1000), "+
"v_rev = EXCLUDED.v_rev, v_build = EXCLUDED.v_rev, host_port = EXCLUDED.host_port, " w.quote(publicIdentity)+", "+major+", "+minor+", "+rev+", "+build+", "+host_port+", "+use_redis+", "+redis_mem_status+") "
"use_redis = EXCLUDED.use_redis, redis_member_status = EXCLUDED.redis_member_status"); "ON CONFLICT (id) DO UPDATE SET cluster_host = EXCLUDED.cluster_host, last_alive = EXCLUDED.last_alive, "
"public_identity = EXCLUDED.public_identity, v_major = EXCLUDED.v_major, v_minor = EXCLUDED.v_minor, "
"v_rev = EXCLUDED.v_rev, v_build = EXCLUDED.v_rev, host_port = EXCLUDED.host_port, "
"use_redis = EXCLUDED.use_redis, redis_member_status = EXCLUDED.redis_member_status");
w.commit();
} catch (std::exception &e) { } catch (std::exception &e) {
fprintf(stderr, "Heartbeat update failed: %s\n", e.what()); fprintf(stderr, "%s: Heartbeat update failed: %s\n", controllerId, e.what());
w.abort(); w.abort();
_pool->unborrow(c); _pool->unborrow(c);
std::this_thread::sleep_for(std::chrono::milliseconds(1000)); std::this_thread::sleep_for(std::chrono::milliseconds(1000));
continue; continue;
} }
w.commit();
} }
_pool->unborrow(c); _pool->unborrow(c);