From 192e5dbff8d86c77c0b7a47ba5d65e3b6599e0de Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Wed, 8 Nov 2017 20:02:10 -0500
Subject: [PATCH] Another fix for uptime logging.
---
controller/RethinkDB.cpp | 4 ++--
controller/RethinkDB.hpp | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/controller/RethinkDB.cpp b/controller/RethinkDB.cpp
index 2da551772..6583f23cb 100644
--- a/controller/RethinkDB.cpp
+++ b/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) {
diff --git a/controller/RethinkDB.hpp b/controller/RethinkDB.hpp
index 561cbdab1..269870192 100644
--- a/controller/RethinkDB.hpp
+++ b/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: