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

cleanup connections after errors

Browse Source
This commit is contained in:
Grant Limberg 2018-09-25 10:17:15 -07:00
parent 0ec6215493
commit 5b222d0a09
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controller/PostgreSQL.cpp
View File

@ -1081,7 +1081,7 @@ void PostgreSQL::onlineNotificationThread()
if (PQresultStatus(res) != PGRES_COMMAND_OK) { if (PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr, "ERROR: Error on commit (onlineNotificationThread): %s\n", PQresultErrorMessage(res)); fprintf(stderr, "ERROR: Error on commit (onlineNotificationThread): %s\n", PQresultErrorMessage(res));
PQclear(res); PQclear(res);
PQexec(conn, "ROLLBACK"); PQclear(PQexec(conn, "ROLLBACK"));
exit(1); exit(1);
} }
PQclear(res); PQclear(res);
@ -1100,7 +1100,7 @@ void PostgreSQL::onlineNotificationThread()
if (PQresultStatus(res) != PGRES_COMMAND_OK) { if (PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr, "ERROR: Error on commit (onlineNotificationThread): %s\n", PQresultErrorMessage(res)); fprintf(stderr, "ERROR: Error on commit (onlineNotificationThread): %s\n", PQresultErrorMessage(res));
PQclear(res); PQclear(res);
PQexec(conn, "ROLLBACK"); PQclear(PQexec(conn, "ROLLBACK"));
exit(1); exit(1);
} }
PQclear(res); PQclear(res);
@ -1181,7 +1181,7 @@ void PostgreSQL::onlineNotificationThread()
if (PQresultStatus(res) != PGRES_COMMAND_OK) { if (PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr, "ERROR: Error on Network Status upsert (onlineNotificationThread): %s\n", PQresultErrorMessage(res)); fprintf(stderr, "ERROR: Error on Network Status upsert (onlineNotificationThread): %s\n", PQresultErrorMessage(res));
PQclear(res); PQclear(res);
PQexec(conn, "ROLLBACK"); PQclear(PQexec(conn, "ROLLBACK"));
exit(1); exit(1);
} }
@ -1190,7 +1190,7 @@ void PostgreSQL::onlineNotificationThread()
if (PQresultStatus(res) != PGRES_COMMAND_OK) { if (PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr, "ERROR: Error on COMMIT (onlineNotificationThread): %s\n" , PQresultErrorMessage(res)); fprintf(stderr, "ERROR: Error on COMMIT (onlineNotificationThread): %s\n" , PQresultErrorMessage(res));
PQclear(res); PQclear(res);
PQexec(conn, "ROLLBACK"); PQclear(PQexec(conn, "ROLLBACK"));
exit(1); exit(1);
} }
@ -1208,7 +1208,7 @@ void PostgreSQL::onlineNotificationThread()
if (PQresultStatus(res) != PGRES_COMMAND_OK) { if (PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr, "ERROR: Error on COMMIT (onlineNotificationThread): %s\n", PQresultErrorMessage(res)); fprintf(stderr, "ERROR: Error on COMMIT (onlineNotificationThread): %s\n", PQresultErrorMessage(res));
PQclear(res); PQclear(res);
PQexec(conn, "ROLLBACK"); PQclear(PQexec(conn, "ROLLBACK"));
exit(1); exit(1);
} }
} }
@ -1223,8 +1223,6 @@ void PostgreSQL::onlineNotificationThread()
queryBuilder << "NOTIFY controller, '" << networkId << ":" << membersStr << "'"; queryBuilder << "NOTIFY controller, '" << networkId << ":" << membersStr << "'";
std::string query = queryBuilder.str(); std::string query = queryBuilder.str();
fprintf(stderr, "%s\n", query.c_str());
PGresult *res = PQexec(conn,query.c_str()); PGresult *res = PQexec(conn,query.c_str());
if (PQresultStatus(res) != PGRES_COMMAND_OK) { if (PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr, "ERROR: Error sending NOTIFY: %s\n", PQresultErrorMessage(res)); fprintf(stderr, "ERROR: Error sending NOTIFY: %s\n", PQresultErrorMessage(res));