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

big refacting of communitation architect

上级 82dffb16
...@@ -209,7 +209,7 @@ private: ...@@ -209,7 +209,7 @@ private:
pid_t pid = 0; pid_t pid = 0;
ret = zmqhelper::forkSubsystem(devSn, e, portRouter, pid); ret = zmqhelper::forkSubsystem(devSn, e, portRouter, pid);
if(0 == ret) { if(0 == ret) {
this->peerData["status"][e] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); this->peerData["status"][e] = 0;
this->peerData["pids"][e] = pid; this->peerData["pids"][e] = pid;
spdlog::info("evdaemon {} created subsystem {}", devSn, e); spdlog::info("evdaemon {} created subsystem {}", devSn, e);
} }
...@@ -237,7 +237,7 @@ private: ...@@ -237,7 +237,7 @@ private:
return -1; return -1;
} }
if(peerData["status"].count(selfId) == 0 || peerData["status"][selfId] == 0) { if((peerData["status"].count(selfId) == 0 || peerData["status"][selfId] == 0) ) {
peerData["status"][selfId] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); peerData["status"][selfId] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
spdlog::info("evdaemon {} peer connected: {}", devSn, selfId); spdlog::info("evdaemon {} peer connected: {}", devSn, selfId);
eventConn = true; eventConn = true;
...@@ -255,9 +255,7 @@ private: ...@@ -255,9 +255,7 @@ private:
peerData["pids"].erase(selfId); peerData["pids"].erase(selfId);
} }
spdlog::warn("evdaemon {} peer disconnected: {}", devSn, selfId); spdlog::warn("evdaemon {} peer {} disconnected. reloading config", devSn, selfId);
spdlog::info("evadmon {} reloading config for {}", devSn, selfId);
if(bBootstrap) { if(bBootstrap) {
ret = reloadCfg(selfId); ret = reloadCfg(selfId);
} }
...@@ -397,8 +395,7 @@ private: ...@@ -397,8 +395,7 @@ private:
if(meta == EV_MSG_META_CONFIG) { if(meta == EV_MSG_META_CONFIG) {
if(data.size() == 0) { if(data.size() == 0) {
spdlog::error("evdaemon {} received invalid empty config", devSn); spdlog::error("evdaemon {} received invalid empty config", devSn);
} } else {
else {
this->deltaCfg = json::diff(this->config, data); this->deltaCfg = json::diff(this->config, data);
spdlog::info("evdaemon {} received cloud config diff: {}\nnew: {}", devSn, this->deltaCfg.dump(4), data.dump()); spdlog::info("evdaemon {} received cloud config diff: {}\nnew: {}", devSn, this->deltaCfg.dump(4), data.dump());
if(this->deltaCfg.size() != 0 || this->bColdStart) { if(this->deltaCfg.size() != 0 || this->bColdStart) {
...@@ -419,7 +416,11 @@ private: ...@@ -419,7 +416,11 @@ private:
else { else {
} }
startSubSystems(); if(bBootstrap) {
startSubSystems();
}else{
spdlog::info("evdaemon {} skip startup subsystems since BOOTSTRAP is set to false", devSn);
}
} }
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论