diff --git a/controller/CV2.cpp b/controller/CV2.cpp index 1b2712566..f74f65eb6 100644 --- a/controller/CV2.cpp +++ b/controller/CV2.cpp @@ -47,15 +47,11 @@ CV2::CV2(const Identity &myId, const char *path, int listenPort) , _waitNoticePrinted(false) , _listenPort(listenPort) { + fprintf(stderr, "CV2::CV2\n"); char myAddress[64]; _myAddressStr = myId.address().toString(myAddress); - // replace cv2: with postgres: for the path/connstring - std::string _path(path); - if (_path.length() > 4 && _path.substr(0, 4) == "cv2:") { - _path = "postgres:" + _path.substr(4); - } - _connString = std::string(_path); + _connString = std::string(path); auto f = std::make_shared(_connString); _pool = std::make_shared >( diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index e9aa032bb..a593f6a53 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -534,11 +534,16 @@ void EmbeddedNetworkController::init(const Identity &signingId,Sender *sender) _signingIdAddressString = signingId.address().toString(tmp); #ifdef ZT_CONTROLLER_USE_LIBPQ + fprintf(stderr, "path: %s\n", _path.c_str()); + fprintf(stderr, "substr: %s\n", _path.substr(0,3).c_str()); if ((_path.length() > 9)&&(_path.substr(0,9) == "postgres:")) { + fprintf(stderr, "CV1\n"); _db.addDB(std::shared_ptr(new CV1(_signingId,_path.substr(9).c_str(), _listenPort, _rc))); - } else if ((_path.length() > 3)&&(_path.substr(0,3) == "cv2:")) { - _db.addDB(std::shared_ptr(new CV2(_signingId,_path.c_str(),_listenPort))); + } else if ((_path.length() > 4)&&(_path.substr(0,4) == "cv2:")) { + fprintf(stderr, "CV2\n"); + _db.addDB(std::shared_ptr(new CV2(_signingId,_path.substr(4).c_str(),_listenPort))); } else { + fprintf(stderr, "FileDB\n"); #endif _db.addDB(std::shared_ptr(new FileDB(_path.c_str()))); #ifdef ZT_CONTROLLER_USE_LIBPQ