提交 f7bf2611 authored 作者: blu's avatar blu

big refacting of communitation architect

上级 44d47f55
...@@ -52,17 +52,17 @@ private: ...@@ -52,17 +52,17 @@ private:
string meta = j.dump(); string meta = j.dump();
vector<vector<uint8_t> > v = {str2body(sn), str2body(devSn), str2body(meta), str2body(cfg)}; vector<vector<uint8_t> > v = {str2body(sn), str2body(devSn), str2body(meta), str2body(cfg)};
if(peerData["status"].count(sn) == 0||peerData["status"][sn] == 0) { // if(peerData["status"].count(sn) == 0||peerData["status"][sn] == 0) {
spdlog::warn("evcloudsvc {} cached config to {}", devSn, sn); // spdlog::warn("evcloudsvc {} cached config to {}", devSn, sn);
lock_guard<mutex> lock(cacheLock); // lock_guard<mutex> lock(cacheLock);
cachedMsg[sn].push(v); // cachedMsg[sn].push(v);
if(cachedMsg[sn].size() > EV_NUM_CACHE_PERPEER) { // if(cachedMsg[sn].size() > EV_NUM_CACHE_PERPEER) {
cachedMsg[sn].pop(); // cachedMsg[sn].pop();
} // }
}else{ // }else{
ret = z_send_multiple(pRouter, v); ret = z_send_multiple(pRouter, v);
spdlog::info("evcloudsvc config sent to {}: {}", sn, cfg); spdlog::info("evcloudsvc config sent to {}: {}", sn, cfg);
} //}
return ret; return ret;
} }
...@@ -371,7 +371,7 @@ public: ...@@ -371,7 +371,7 @@ public:
spdlog::error("evcloudsvc failed to load config for device: {}", k); spdlog::error("evcloudsvc failed to load config for device: {}", k);
}else{ }else{
this->peerData["config"][k] = cfg; this->peerData["config"][k] = cfg;
spdlog::info("evcloudsvc laod config for device: {}", k); spdlog::info("evcloudsvc loaded config for device: {}", k);
} }
} }
......
...@@ -439,7 +439,7 @@ class EvDaemon{ ...@@ -439,7 +439,7 @@ class EvDaemon{
json diff = json::diff(config, data); json diff = json::diff(config, data);
// TODO: calc diff // TODO: calc diff
spdlog::info("evdaemon {} received cloud config diff:\n{}\nfull\n{}", devSn, diff.dump(4), data.dump(4)); spdlog::info("evdaemon {} received cloud config diff:\n{}\n\norigin\n{}", devSn, diff.dump(), data.dump());
bReload = true; bReload = true;
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论