summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Limberg <grant.limberg@zerotier.com>2018-11-13 16:19:55 -0800
committerGrant Limberg <grant.limberg@zerotier.com>2018-11-13 16:19:55 -0800
commite3381a4c1f7bab6aef3fba42fd0412a2d9a3073c (patch)
tree2a4f52a4c990290f268fdcb58517a19db6c1a5ca
parent01c18cc442c03ac9ec18feffba3c97f6a1f4072f (diff)
downloadinfinitytier-e3381a4c1f7bab6aef3fba42fd0412a2d9a3073c.tar.gz
infinitytier-e3381a4c1f7bab6aef3fba42fd0412a2d9a3073c.zip
fix member init query
-rw-r--r--controller/PostgreSQL.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp
index 1b97042c..c99974fd 100644
--- a/controller/PostgreSQL.cpp
+++ b/controller/PostgreSQL.cpp
@@ -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) "