diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-08-09 11:31:37 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-08-09 11:31:37 -0700 |
| commit | 553101e8b5a988003f594037dda82301b0967625 (patch) | |
| tree | 8fccc387144b19810bc26d5395666ebace4adbb0 /controller/RethinkDB.cpp | |
| parent | 3cd0ab1b3bacd5596d7fec989b2cd9cb413f4314 (diff) | |
| parent | e01c0adff28602d48ad6f0d618bee072ec7843da (diff) | |
| download | infinitytier-553101e8b5a988003f594037dda82301b0967625.tar.gz infinitytier-553101e8b5a988003f594037dda82301b0967625.zip | |
merge dev
Diffstat (limited to 'controller/RethinkDB.cpp')
| -rw-r--r-- | controller/RethinkDB.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/controller/RethinkDB.cpp b/controller/RethinkDB.cpp index f6c8a59c..a46d033f 100644 --- a/controller/RethinkDB.cpp +++ b/controller/RethinkDB.cpp @@ -263,9 +263,13 @@ RethinkDB::RethinkDB(EmbeddedNetworkController *const nc,const Identity &myId,co std::unique_ptr<R::Connection> rdb; while (_run == 1) { try { - if (!rdb) + if (!rdb) { + _connected = 0; rdb = R::connect(this->_host,this->_port,this->_auth); + } + if (rdb) { + _connected = 1; R::Array batch; R::Object tmpobj; @@ -434,6 +438,11 @@ bool RethinkDB::waitForReady() return true; } +bool RethinkDB::isReady() +{ + return ((_ready)&&(_connected)); +} + void RethinkDB::save(nlohmann::json *orig,nlohmann::json &record) { if (!record.is_object()) // sanity check |