ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-15 21:58:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

handle case of no networks and/or no members

Browse Source
This commit is contained in:
Grant Limberg
2020-06-04 14:06:30 -07:00
parent 17c7ae20cc
commit 9b92ad7772
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controller/PostgreSQL.cpp
View File

@ -437,6 +437,7 @@ void PostgreSQL::initializeNetworks(PGconn *conn)
PQclear(res); PQclear(res);
if(!networkSet.empty()) {
if (_rc && _rc->clusterMode) { if (_rc && _rc->clusterMode) {
auto tx = _cluster->transaction(_myAddressStr, true); auto tx = _cluster->transaction(_myAddressStr, true);
tx.sadd(setKey, networkSet.begin(), networkSet.end()); tx.sadd(setKey, networkSet.begin(), networkSet.end());
@ -446,6 +447,7 @@ void PostgreSQL::initializeNetworks(PGconn *conn)
tx.sadd(setKey, networkSet.begin(), networkSet.end()); tx.sadd(setKey, networkSet.begin(), networkSet.end());
tx.exec(); tx.exec();
} }
}
if (++this->_ready == 2) { if (++this->_ready == 2) {
if (_waitNoticePrinted) { if (_waitNoticePrinted) {
@ -643,6 +645,7 @@ void PostgreSQL::initializeMembers(PGconn *conn)
PQclear(res); PQclear(res);
if (!networkMembers.empty()) {
if (_rc != NULL) { if (_rc != NULL) {
if (_rc->clusterMode) { if (_rc->clusterMode) {
auto tx = _cluster->transaction(_myAddressStr, true); auto tx = _cluster->transaction(_myAddressStr, true);
@ -658,6 +661,7 @@ void PostgreSQL::initializeMembers(PGconn *conn)
tx.exec(); tx.exec();
} }
} }
}
if (++this->_ready == 2) { if (++this->_ready == 2) {
if (_waitNoticePrinted) { if (_waitNoticePrinted) {
fprintf(stderr,"[%s] NOTICE: %.10llx controller PostgreSQL data download complete." ZT_EOL_S,_timestr(),(unsigned long long)_myAddress.toInt()); fprintf(stderr,"[%s] NOTICE: %.10llx controller PostgreSQL data download complete." ZT_EOL_S,_timestr(),(unsigned long long)_myAddress.toInt());