Skip to content

E
evsuits
提交 12b9bac8 authored 作者: blu's avatar blu
浏览文件
操作

revise getModulesOperFromConfDiff and related applications

上级 6f1ad9c4
显示空白字符变更
内嵌 并排
正在显示 包含 64 行增加 和 26 行删除
opencv-motion-detect/deployment/config.json
浏览文件 @ 12b9bac8
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"enabled":1, "enabled":1,
"iid":1, "iid":1,
"post":30, "post":30,
"pre":3, "pre":4,
"sn":"V2I0C7KC", "sn":"V2I0C7KC",
"thresh":30, "thresh":30,
"entropy": 0.3, "entropy": 0.3,
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
], ],
"evpusher":[ "evpusher":[
{ {
"enabled":0, "enabled":1,
"iid":1, "iid":2,
"password":"", "password":"",
"sn":"V2I0C7KC", "sn":"V2I0C7KC",
"token":"", "token":"",
......
opencv-motion-detect/inc/utils.cpp
浏览文件 @ 12b9bac8
...@@ -148,7 +148,7 @@ int getPeerId(string modName, json& modElem, string &peerId, string &peerName) ...@@ -148,7 +148,7 @@ int getPeerId(string modName, json& modElem, string &peerId, string &peerName)
return 0; return 0;
} }
/// ret["data"] is json array contains gids /// ret["data"] is json map. key: mod gid; value: 0 - disabled, 1 - enabled
/// ret["code"], ["msg"] indicates error if not 0. /// ret["code"], ["msg"] indicates error if not 0.
/// ipcIdx: -1 - all IPCS, otherwise - ipc specified by ipcIdx /// ipcIdx: -1 - all IPCS, otherwise - ipc specified by ipcIdx
json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx) json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx)
...@@ -165,7 +165,7 @@ json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx) ...@@ -165,7 +165,7 @@ json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx)
pid_t pid; pid_t pid;
for(auto &[k,v]:data.items()) { for(auto &[k,v]:data.items()) {
if(v.count("sn") == 0|| v["sn"].size() == 0 || v.count("ipcs") == 0 || v["ipcs"].size() == 0) { if(v.count("sn") == 0|| v["sn"].size() == 0 || v.count("ipcs") == 0 || v["ipcs"].size() == 0) {
msg += fmt::format( "\t\tcluster {} has no sn/ipcs field", v.dump()); msg += fmt::format( "\t\tcluster {} has no sn/ipcs field {}:{}", v.dump(), __FILE__, __LINE__);
spdlog::warn(msg); spdlog::warn(msg);
ret["msg"] = msg; ret["msg"] = msg;
continue; continue;
...@@ -188,7 +188,7 @@ json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx) ...@@ -188,7 +188,7 @@ json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx)
} }
if(ipc.count("modules") == 0|| ipc["modules"].size() == 0) { if(ipc.count("modules") == 0|| ipc["modules"].size() == 0) {
msg += fmt::format( "\t\tipc {} has no modules field", ipc.dump()); msg += fmt::format( "\t\tipc {} has no modules field. {}:{}", __FILE__, __LINE__, ipc.dump());
spdlog::warn(msg); spdlog::warn(msg);
ret["msg"] = msg; ret["msg"] = msg;
continue; continue;
...@@ -197,7 +197,7 @@ json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx) ...@@ -197,7 +197,7 @@ json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx)
for(auto &[mn, ml] : modules.items()) { for(auto &[mn, ml] : modules.items()) {
for(auto &m : ml) { for(auto &m : ml) {
if(m.count("sn") == 0 || m["sn"].size() == 0 || m.count("iid") == 0 || (mn=="evml" && (m.count("type") == 0 || m["type"].size() == 0))) { if(m.count("sn") == 0 || m["sn"].size() == 0 || m.count("iid") == 0 || (mn=="evml" && (m.count("type") == 0 || m["type"].size() == 0))) {
msg += fmt::format( "\t\tmodule {} has no sn/iid/type(evml only) field", m.dump()); msg += fmt::format( "\t\tmodule {} has no sn/iid/type(evml only) field. {}:{}", m.dump(), __FILE__, __LINE__);
spdlog::warn(msg); spdlog::warn(msg);
ret["msg"] = msg; ret["msg"] = msg;
continue; continue;
...@@ -209,13 +209,19 @@ json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx) ...@@ -209,13 +209,19 @@ json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx)
string peerName; string peerName;
int iret = cfgutils::getPeerId(mn, m, peerId, peerName); int iret = cfgutils::getPeerId(mn, m, peerId, peerName);
if(iret != 0) { if(iret != 0) {
// TODO: do we need to treat it more strictly, to make it fails fast??? // TODO: do we need to treat it more strictly, to make it fails fast???
spdlog::error("{} getModuleGidsFromCfg for {} invalid config found in module {} of {}",caller, sn, m.dump(), data.dump()); spdlog::error("{}:{} {} getModuleGidsFromCfg for {} invalid config found in module {} of {}",__FILE__, __LINE__, caller, sn, m.dump(), data.dump());
continue; continue;
} }
else { else {
ret["data"].push_back(peerId); if(m.count("enabled") == 0 || m["enabled"] == 0) {
// disabled
ret["data"][peerId] = 0;
}else{
ret["data"][peerId] = 1;
}
} }
} }
} }
...@@ -229,7 +235,7 @@ json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx) ...@@ -229,7 +235,7 @@ json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx)
} }
} }
catch(exception &e) { catch(exception &e) {
string msg = fmt::format("{} getModuleGidsFromCfg exception {} in config {}",caller, sn, e.what(), data.dump()); string msg = fmt::format("{}:{} {} getModuleGidsFromCfg exception {} in config {}",__FILE__, __LINE__, caller, sn, e.what(), data.dump());
spdlog::error(msg); spdlog::error(msg);
ret["msg"] = msg; ret["msg"] = msg;
ret["code"] = -1; ret["code"] = -1;
...@@ -505,12 +511,15 @@ json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, st ...@@ -505,12 +511,15 @@ json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, st
ret["data"][newGid] = 2; // start ret["data"][newGid] = 2; // start
} }
}else{ // other prop modification }else{ // other prop modification
// it was disabled. just ignore if(ret["data"].count(newGid) == 0 ||(ret["data"][newGid] != 0 && ret["data"][newGid] != 1)) {
if(ret["data"].count(newGid) != 0 && (ret["data"][newGid].get<int>() == 0 || ret["data"][newGid].get<int>() == 1)) { if(oldGid != newGid) {
// nop. stopped or disabled ret["data"][newGid] = 2; // start
}else{ }else{
ret["data"][newGid] = 3; // restart ret["data"][newGid] = 3; // restart
} }
}else{
// no op
}
} }
} }
} }
...@@ -574,6 +583,7 @@ json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, st ...@@ -574,6 +583,7 @@ json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, st
} }
if(oldModObj.size() != 0) { if(oldModObj.size() != 0) {
spdlog::info("old mod: {}", oldModObj.dump());
string modSn = sn.empty()? oldModObj["sn"].get<string>(): sn; string modSn = sn.empty()? oldModObj["sn"].get<string>(): sn;
if(oldModObj["sn"].get<string>() == modSn){ if(oldModObj["sn"].get<string>() == modSn){
if(modName == "evml") { if(modName == "evml") {
...@@ -616,30 +626,57 @@ json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, st ...@@ -616,30 +626,57 @@ json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, st
if (std::regex_match(path_, results, clusterRegex)) { if (std::regex_match(path_, results, clusterRegex)) {
if (results.size() == 2) { if (results.size() == 2) {
matched = true; matched = true;
spdlog::info("{}:{}: path matched whole cluster: {}", path_); spdlog::info("{}:{}: path matched whole cluster: {}",__FILE__, __LINE__, path_);
string mgrSn = results[1].str(); string mgrSn = results[1].str();
json mgr; json oldMgr, newMgr;
if(d["op"] == "remove"){
mgr[mgrSn] = oldConfig[mgrSn]; if(oldConfig.count(mgrSn) != 0) {
oldMgr[mgrSn] = json();
oldMgr[mgrSn] = oldConfig[mgrSn];
}
if(newConfig.count(mgrSn) != 0) {
newMgr[mgrSn] = json();
newMgr[mgrSn] = newConfig[mgrSn];
}
if(newMgr.size() != 0) {
json jret = cfgutils::getModuleGidsFromCfg(sn, newMgr, "");
spdlog::info("{}:{} getModuleGidsFromCfg dump: {}", __FILE__, __LINE__, jret.dump());
if(jret["code"] != 0) {
ret["msg"] = jret["msg"];
hasError = false; // TODO:
continue;
}else{ }else{
mgr[mgrSn] = newConfig[mgrSn]; if(jret["msg"] != "ok") {
ret["msg"] = jret["msg"];
}
for(auto &[k,v]: jret["data"].items()) {
if(ret["data"].count(string(k)) == 0||(ret["data"][string(k)] != 0 && ret["data"][string(k)] !=1)){
ret["data"][string(k)] = int(v) == 0? int(v): int(v)+1;
}
}
}
} }
json jret = cfgutils::getModuleGidsFromCfg(sn, mgr, ""); if(oldMgr.size() != 0) {
json jret = cfgutils::getModuleGidsFromCfg(sn, oldMgr, "");
spdlog::info("{}:{} getModuleGidsFromCfg dump: {}", __FILE__, __LINE__, jret.dump()); spdlog::info("{}:{} getModuleGidsFromCfg dump: {}", __FILE__, __LINE__, jret.dump());
if(jret["code"] != 0) { if(jret["code"] != 0) {
ret["msg"] = jret["msg"]; ret["msg"] = jret["msg"];
hasError = true; hasError = false; // TODO:
break; continue;
}else{ }else{
if(jret["msg"] != "ok") { if(jret["msg"] != "ok") {
ret["msg"] = jret["msg"]; ret["msg"] = jret["msg"];
} }
for(auto &k: jret["data"]) { for(auto &[k, v]: jret["data"].items()) {
if(d["op"] == "remove"){ if(ret["data"].count(string(k)) == 0){
ret["data"][string(k)] = 0; ret["data"][string(k)] = 1;
}else{ }else{
ret["data"][string(k)] = 2; if(ret["data"][string(k)] == 2) { // change start to restart
ret["data"][string(k)] = 3;
}
}
} }
} }
} }
......
opencv-motion-detect/test_regex.cpp
浏览文件 @ 12b9bac8
...@@ -23,6 +23,6 @@ int main(){ ...@@ -23,6 +23,6 @@ int main(){
config2 = config2["data"]; config2 = config2["data"];
json dif = json::diff(config2, config); json dif = json::diff(config2, config);
spdlog::info("diff: {}", dif.dump()); spdlog::info("diff: {}", dif.dump());
auto ret = cfgutils::getModulesOperFromConfDiff(config2, config, dif, "PSBV7GKN"); auto ret = cfgutils::getModulesOperFromConfDiff(config2, config, dif, "");
spdlog::info("parse: {}", ret.dump()); spdlog::info("parse: {}", ret.dump());
} }
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论