提交 960358ab authored 作者: blu's avatar blu

refactor of delta config

上级 b682699d
...@@ -237,13 +237,23 @@ private: ...@@ -237,13 +237,23 @@ private:
} }
// both exist, calc diff // both exist, calc diff
json diff = json::diff(this->peerData["config"][k], v); json srcJson, targetJson;
srcJson[k] = this->peerData["config"][k];
targetJson[k] = v;
json diff = json::diff(srcJson, targetJson);
if(diff.size() == 0) { if(diff.size() == 0) {
spdlog::info("evcloudsvc no diffrence for cluster {}, ignore it.", k); spdlog::info("evcloudsvc no diffrence for cluster {}, ignore it.", k);
} }
else { else {
auto gids = cfgutils::getModulesOperFromConfDiff(this->peerData["config"][k], v, diff, ""); auto gids = cfgutils::getModulesOperFromConfDiff(srcJson, targetJson, diff, "");
for(auto &[a,b]: gids.items()) { spdlog::info("dump gids: {}", gids.dump());
if(gids["code"] != 0) {
hasError = true;
msg = gids["msg"];
break;
}
for(auto &[a,b]: gids["data"].items()) {
string devSn = strutils::split(a, ':')[0]; string devSn = strutils::split(a, ':')[0];
deltaCfg[devSn] = 1; deltaCfg[devSn] = 1;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论