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

insert/update host_port on controller start

Browse source
This commit is contained in:
Grant Limberg 2019-01-21 11:29:13 -08:00
parent 2294770e56
commit 7414418e2e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
controller/PostgreSQL.cpp
View file

@ -537,7 +537,8 @@ void PostgreSQL::heartbeat()
std::string rev = std::to_string(ZEROTIER_ONE_VERSION_REVISION); std::string rev = std::to_string(ZEROTIER_ONE_VERSION_REVISION);
std::string build = std::to_string(ZEROTIER_ONE_VERSION_BUILD); std::string build = std::to_string(ZEROTIER_ONE_VERSION_BUILD);
std::string now = std::to_string(OSUtils::now()); std::string now = std::to_string(OSUtils::now());
const char *values[8] = { std::string host_port = std::to_string(_listenPort);
const char *values[9] = {
controllerId, controllerId,
hostname, hostname,
now.c_str(), now.c_str(),
@ -545,16 +546,17 @@ void PostgreSQL::heartbeat()
major.c_str(), major.c_str(),
minor.c_str(), minor.c_str(),
rev.c_str(), rev.c_str(),
build.c_str() build.c_str(),
host_port.c_str()
}; };
PGresult *res = PQexecParams(conn, PGresult *res = PQexecParams(conn,
"INSERT INTO ztc_controller (id, cluster_host, last_alive, public_identity, v_major, v_minor, v_rev, v_build) " "INSERT INTO ztc_controller (id, cluster_host, last_alive, public_identity, v_major, v_minor, v_rev, v_build, host_port) "
"VALUES ($1, $2, TO_TIMESTAMP($3::double precision/1000), $4, $5, $6, $7, $8) " "VALUES ($1, $2, TO_TIMESTAMP($3::double precision/1000), $4, $5, $6, $7, $8, $9) "
"ON CONFLICT (id) DO UPDATE SET cluster_host = EXCLUDED.cluster_host, last_alive = EXCLUDED.last_alive, " "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, " "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", "v_rev = EXCLUDED.v_rev, v_build = EXCLUDED.v_rev, host_port = EXCLUDED.host_port",
8, // number of parameters 9, // number of parameters
NULL, // oid field. ignore NULL, // oid field. ignore
values, // values for substitution values, // values for substitution
NULL, // lengths in bytes of each value NULL, // lengths in bytes of each value