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

docs, and make RethinkDB controller DB driver upsert into the Controller DB and also update the hostname field.

Browse Source
This commit is contained in:
Adam Ierymenko
2017-12-07 13:39:25 -08:00
parent ada611d597
commit 8d9464c414
8 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controller/EmbeddedNetworkController.cpp
View File

@ -477,10 +477,10 @@ void EmbeddedNetworkController::init(const Identity &signingId,Sender *sender)
_signingIdAddressString = signingId.address().toString(tmp);
#ifdef ZT_CONTROLLER_USE_RETHINKDB
if ((_path.length() > 10)&&(_path.substr(0,10) == "rethinkdb:"))
_db.reset(new RethinkDB(this,_signingId.address(),_path.c_str()));
_db.reset(new RethinkDB(this,_signingId,_path.c_str()));
else // else use FileDB after endif
#endif
_db.reset(new FileDB(this,_signingId.address(),_path.c_str()));
_db.reset(new FileDB(this,_signingId,_path.c_str()));
_db->waitForReady();
}