diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-03-08 13:16:02 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-03-08 13:16:02 -0800 |
| commit | d7a6357393f25748e4256d6ccf1321d7532d02b9 (patch) | |
| tree | 177ddac683b2a4c688da02f809f6e008fc5d22a4 /controller/EmbeddedNetworkController.cpp | |
| parent | 6fbf21b4f0abb89049e724b3bd625458327b6a77 (diff) | |
| parent | 993d850f697dbedd5c8967f7fab482af923df926 (diff) | |
| download | infinitytier-d7a6357393f25748e4256d6ccf1321d7532d02b9.tar.gz infinitytier-d7a6357393f25748e4256d6ccf1321d7532d02b9.zip | |
Merge branch 'dev' into edge
Diffstat (limited to 'controller/EmbeddedNetworkController.cpp')
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index 8b3f1517..5ddcaa4b 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -464,12 +464,13 @@ static bool _parseRule(json &r,ZT_VirtualNetworkRule &rule) } // anonymous namespace -EmbeddedNetworkController::EmbeddedNetworkController(Node *node,const char *dbPath, int listenPort) : +EmbeddedNetworkController::EmbeddedNetworkController(Node *node,const char *dbPath, int listenPort, MQConfig *mqc) : _startTime(OSUtils::now()), _listenPort(listenPort), _node(node), _path(dbPath), - _sender((NetworkController::Sender *)0) + _sender((NetworkController::Sender *)0), + _mqc(mqc) { } @@ -489,7 +490,7 @@ void EmbeddedNetworkController::init(const Identity &signingId,Sender *sender) _signingIdAddressString = signingId.address().toString(tmp); #ifdef ZT_CONTROLLER_USE_LIBPQ if ((_path.length() > 9)&&(_path.substr(0,9) == "postgres:")) - _db.reset(new PostgreSQL(this,_signingId,_path.substr(9).c_str(), _listenPort)); + _db.reset(new PostgreSQL(this,_signingId,_path.substr(9).c_str(), _listenPort, _mqc)); else // else use FileDB after endif #endif _db.reset(new FileDB(this,_signingId,_path.c_str())); |