ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-18 10:46:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix member init query

Browse Source
This commit is contained in:
Grant Limberg 2018-11-13 16:19:55 -08:00
parent 01c18cc442
commit e3381a4c1f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controller/PostgreSQL.cpp
View File

@ -360,7 +360,7 @@ void PostgreSQL::initializeMembers(pqxx::connection &conn)
" EXTRACT(EPOCH FROM m.last_deauthorized_time AT TIME ZONE 'UTC')*1000 AS last_deauthorized_time, "
" m.remote_trace_level AS remote_trace_level, m.remote_trace_target AS remote_trace_target, "
" m.tags AS tags, m.v_major AS v_major, m.v_minor AS v_minor, m.v_rev AS v_rev, "
" m.v_proto AS v_proto, m.no_auto_assign_ips AS no_auto_assign_ips, m.revision AS revision"
" m.v_proto AS v_proto, m.no_auto_assign_ips AS no_auto_assign_ips, m.revision AS revision "
"FROM ztc_member m "
"INNER JOIN ztc_network n "
" ON n.id = m.network_id "
@ -484,13 +484,13 @@ void PostgreSQL::heartbeat()
const char *publicIdentity = publicId;
const char *hostname = hostnameTmp;
fprintf(stderr, "Heartbeat connection opening");
fprintf(stderr, "Heartbeat connection opening\n");
pqxx::connection conn(_connString);
if (!conn.is_open()) {
fprintf(stderr, "Connection to database failed: heartbeat\n");
exit(1);
}
fprintf(stderr, "Heartbeat connection opened");
fprintf(stderr, "Heartbeat connection opened\n");
conn.prepare("heartbeat",
"INSERT INTO ztc_controller (id, cluster_host, last_alive, public_identity, v_major, v_minor, v_rev, v_build) "
"VALUES ($1, $2, TO_TIMESTAMP($3::double precision/1000), $4, $5, $6, $7, $8) "