浏览代码

Another fix for uptime logging.

Adam Ierymenko 7 年之前
父节点
当前提交
192e5dbff8
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. 2 2
      controller/RethinkDB.cpp
  2. 6 0
      controller/RethinkDB.hpp

+ 2 - 2
controller/RethinkDB.cpp

@@ -233,12 +233,12 @@ RethinkDB::RethinkDB(EmbeddedNetworkController *const nc,const Address &myAddres
 							tmpobj["ts"] = i->second;
 							batch.emplace_back(tmpobj);
 							if (batch.size() >= 256) {
-								R::db(this->_db).table("MemberLastRequest",R::optargs("read_mode","outdated")).insert(R::args(batch),R::optargs("conflict","update")).run(*rdb);
+								R::db(this->_db).table("MemberLastRequest",R::optargs("read_mode","outdated")).insert(batch,R::optargs("conflict","update")).run(*rdb);
 								batch.clear();
 							}
 						}
 						if (batch.size() > 0)
-							R::db(this->_db).table("MemberLastRequest",R::optargs("read_mode","outdated")).insert(R::args(batch),R::optargs("conflict","update")).run(*rdb);
+							R::db(this->_db).table("MemberLastRequest",R::optargs("read_mode","outdated")).insert(batch,R::optargs("conflict","update")).run(*rdb);
 						_lastOnline.clear();
 					}
 				} catch (std::exception &e) {

+ 6 - 0
controller/RethinkDB.hpp

@@ -28,6 +28,12 @@
 namespace ZeroTier
 {
 
+/**
+ * A controller database driver that talks to RethinkDB
+ *
+ * This is for use with ZeroTier Central. Others are free to build and use it
+ * but be aware that we might change it at any time.
+ */
 class RethinkDB : public DB
 {
 public: