提交 593bcfae authored 作者: blu's avatar blu

revise getModulesOperFromConfDiff and related applications

上级 12b9bac8
...@@ -298,11 +298,15 @@ private: ...@@ -298,11 +298,15 @@ private:
spdlog::info("evdaemon {} startSubSystems config diff to module action: {} -> {}", this->devSn, string(k), int(v)); spdlog::info("evdaemon {} startSubSystems config diff to module action: {} -> {}", this->devSn, string(k), int(v));
if(v == 0) { if(v == 0) {
// stop // stop
this->peerData["status"][k] = -2; // stopped this->peerData["status"][k] = 1; // disabled
sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, "0");
}else if(v == 1) { // perm stop
this->peerData["status"][k] = 2;
this->peerData["config"].erase(k);
sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, "0"); sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, "0");
} }
else if(int(v) == 1 || int(v) == 2) { else if(int(v) == 2||int(v) == 3) {
int status = (this->peerData["status"].count(k) == 0) ? -1:this->peerData["status"][k].get<int>(); int status = (this->peerData["status"].count(k) == 0) ? -1:this->peerData["status"][k].get<int>();
spdlog::info("evdaemon {} module {} status {}", this->devSn, k, status); spdlog::info("evdaemon {} module {} status {}", this->devSn, k, status);
if(this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0||this->peerData["status"][k] == -1) { if(this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0||this->peerData["status"][k] == -1) {
...@@ -319,8 +323,9 @@ private: ...@@ -319,8 +323,9 @@ private:
} }
} }
else { else {
// restart if(int(v) == 3) {
sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, to_string(v)); sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, to_string(v));
}
} }
} }
else { else {
...@@ -381,7 +386,7 @@ private: ...@@ -381,7 +386,7 @@ private:
spdlog::info("evdaemon {} peer {} config sent: {}", devSn,selfId, cfg); spdlog::info("evdaemon {} peer {} config sent: {}", devSn,selfId, cfg);
} }
else { else {
if(peerData["status"][selfId] == -2){ if(peerData["status"][selfId] == 1 || peerData["status"][selfId] == 2){
spdlog::warn("evdaemon {} refuse to start {}: it was asked to be stopped, and is removed from cluster config", this->devSn, selfId); spdlog::warn("evdaemon {} refuse to start {}: it was asked to be stopped, and is removed from cluster config", this->devSn, selfId);
}else{ }else{
peerData["status"][selfId] = 0; peerData["status"][selfId] = 0;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论