dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not serve controller requests until init is done.

Browse source
This commit is contained in:
Adam Ierymenko 2017-04-24 09:09:04 -07:00
parent 44cb2f4efd
commit f4feccc626
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
controller/JSONDB.hpp
View file

@ -36,6 +36,7 @@
#include "../ext/json/json.hpp"
#include "../osdep/OSUtils.hpp"
#include "../osdep/Http.hpp"
#include "../osdep/Thread.hpp"
namespace ZeroTier {
@ -47,12 +48,6 @@ class JSONDB
public:
JSONDB(const std::string &basePath);
inline void reload()
{
_db.clear();
_reload(_basePath,std::string());
}
bool writeRaw(const std::string &n,const std::string &obj);
bool put(const std::string &n,const nlohmann::json &obj);
@ -79,6 +74,11 @@ public:
template<typename F>
inline void filter(const std::string &prefix,F func)
{
while (!_ready) {
Thread::sleep(250);
_ready = _reload(_basePath,std::string());
}
for(std::map<std::string,_E>::iterator i(_db.lower_bound(prefix));i!=_db.end();) {
if ((i->first.length() >= prefix.length())&&(!memcmp(i->first.data(),prefix.data(),prefix.length()))) {
if (!func(i->first,get(i->first))) {
@ -94,7 +94,7 @@ public:
inline bool operator!=(const JSONDB &db) const { return (!(*this == db)); }
private:
void _reload(const std::string &p,const std::string &b);
bool _reload(const std::string &p,const std::string &b);
bool _isValidObjectName(const std::string &n);
std::string _genPath(const std::string &n,bool create);
@ -108,6 +108,7 @@ private:
InetAddress _httpAddr;
std::string _basePath;
std::map<std::string,_E> _db;
volatile bool _ready;
};
} // namespace ZeroTier