Skip to content

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

refactor of delta config

上级 217dce32
隐藏空白字符变更
内嵌 并排
正在显示 包含 604 行增加 和 353 行删除
opencv-motion-detect/inc/utils.cpp
浏览文件 @ f981a53a
...@@ -2,442 +2,619 @@ ...@@ -2,442 +2,619 @@
// cloudutils // cloudutils
namespace cloudutils namespace cloudutils {
{
/// [deprecated] ref: ../config.json /// [deprecated] ref: ../config.json
json registry(json &conf, string sn, string module) { json registry(json &conf, string sn, string module)
json ret; {
string api; json ret;
try{ string api;
api = conf.at("data").at(sn).at("api-cloud").get<string>() + "/register"; try {
Uri uri=Uri::Parse(api); api = conf.at("data").at(sn).at("api-cloud").get<string>() + "/register";
if(uri.Host.empty()||uri.Port.empty()||uri.Protocol.find("http") == string::npos||uri.Path.empty()) { Uri uri=Uri::Parse(api);
string msg = "registry error. invalid api-cloud in config: " + api; if(uri.Host.empty()||uri.Port.empty()||uri.Protocol.find("http") == string::npos||uri.Path.empty()) {
ret["code"] = 1; string msg = "registry error. invalid api-cloud in config: " + api;
ret["msg"] = msg; ret["code"] = 1;
spdlog::error(msg); ret["msg"] = msg;
return ret; spdlog::error(msg);
} return ret;
}
Params params;
params.emplace("sn", sn); Params params;
params.emplace("module", module); params.emplace("sn", sn);
Client cli(uri.Host.c_str(), stoi(uri.Port)); params.emplace("module", module);
Client cli(uri.Host.c_str(), stoi(uri.Port));
auto res = cli.Post("/register", Headers(), params, conf.dump(), "text/json");
spdlog::debug("{} {} registry res from cloud : {}", __FILE__, __LINE__, res->body); auto res = cli.Post("/register", Headers(), params, conf.dump(), "text/json");
ret = json::parse(res->body); spdlog::debug("{} {} registry res from cloud : {}", __FILE__, __LINE__, res->body);
}catch(exception &e) { ret = json::parse(res->body);
ret["code"] = -1; }
string msg = string(__FILE__) + ":" + to_string(__LINE__) + string(": registry exception - ") + e.what(); catch(exception &e) {
ret["msg"] = msg; ret["code"] = -1;
spdlog::error(msg); string msg = string(__FILE__) + ":" + to_string(__LINE__) + string(": registry exception - ") + e.what();
} ret["msg"] = msg;
spdlog::error(msg);
// /Client cli; }
return ret;
// /Client cli;
return ret;
} }
/// req config /// req config
json reqConfig(json &info){ json reqConfig(json &info)
json ret; {
string api; json ret;
try{ string api;
api = info.at("api-cloud").get<string>(); try {
Uri uri=Uri::Parse(api); api = info.at("api-cloud").get<string>();
string sn = info.at("sn").get<string>(); Uri uri=Uri::Parse(api);
if(uri.Host.empty()||uri.Port.empty()||uri.Protocol.find("http") == string::npos) { string sn = info.at("sn").get<string>();
string msg = string(__FILE__) +":" + to_string(__LINE__) + ": request cloud configuration error. invalid api-cloud in info: " + api; if(uri.Host.empty()||uri.Port.empty()||uri.Protocol.find("http") == string::npos) {
ret["code"] = EVCLOUD_REQ_E_PARAM; string msg = string(__FILE__) +":" + to_string(__LINE__) + ": request cloud configuration error. invalid api-cloud in info: " + api;
ret["msg"] = msg; ret["code"] = EVCLOUD_REQ_E_PARAM;
spdlog::error(msg); ret["msg"] = msg;
return ret; spdlog::error(msg);
} return ret;
}
Params params;
params.emplace("sn", sn); Params params;
Client cli(uri.Host.c_str(), stoi(uri.Port)); params.emplace("sn", sn);
Client cli(uri.Host.c_str(), stoi(uri.Port));
auto res = cli.Get("/config", Headers(), params);
if(res == nullptr || res->status != 200) { auto res = cli.Get("/config", Headers(), params);
const char *msg = NULL; if(res == nullptr || res->status != 200) {
if(res == nullptr) { const char *msg = NULL;
msg = (string("error to connect to server: ") + api + "/config").c_str(); if(res == nullptr) {
ret["code"] = EVCLOUD_REQ_E_CONN; msg = (string("error to connect to server: ") + api + "/config").c_str();
}else{ ret["code"] = EVCLOUD_REQ_E_CONN;
msg = httplib::detail::status_message(res->status); }
ret["code"] = res->status; else {
} msg = httplib::detail::status_message(res->status);
spdlog::debug("failed to reqConfig. {}", msg); ret["code"] = res->status;
ret["msg"] = msg; }
}else{ spdlog::debug("failed to reqConfig. {}", msg);
spdlog::debug("{} {} registry res from cloud : {}", __FILE__, __LINE__, res->body); ret["msg"] = msg;
ret = json::parse(res->body); }
} else {
}catch(exception &e) { spdlog::debug("{} {} registry res from cloud : {}", __FILE__, __LINE__, res->body);
ret["code"] = EVCLOUD_REQ_E_DATA; ret = json::parse(res->body);
string msg = string(__FILE__) + ":" + to_string(__LINE__) + string(": registry exception - ") + e.what(); }
ret["msg"] = msg; }
spdlog::error(msg); catch(exception &e) {
} ret["code"] = EVCLOUD_REQ_E_DATA;
string msg = string(__FILE__) + ":" + to_string(__LINE__) + string(": registry exception - ") + e.what();
// /Client cli; ret["msg"] = msg;
return ret; spdlog::error(msg);
}
// /Client cli;
return ret;
} }
} // namespace cloudutils } // namespace cloudutils
/// ///
namespace strutils{ namespace strutils {
vector<string> split(const std::string& s, char delimiter) vector<string> split(const std::string& s, char delimiter)
{ {
std::vector<std::string> tokens; std::vector<std::string> tokens;
std::string token; std::string token;
std::istringstream tokenStream(s); std::istringstream tokenStream(s);
while (getline(tokenStream, token, delimiter)) while (getline(tokenStream, token, delimiter)) {
{ tokens.push_back(token);
tokens.push_back(token); }
} return tokens;
return tokens;
} }
}//namespace strutils }//namespace strutils
namespace cfgutils { namespace cfgutils {
int getPeerId(string modName, json& modElem, string &peerId, string &peerName) { int getPeerId(string modName, json& modElem, string &peerId, string &peerName)
try { {
if(modName == "evmgr") { try {
if(modName == "evmgr") {
peerId = modElem["sn"].get<string>() + ":evmgr:0"; peerId = modElem["sn"].get<string>() + ":evmgr:0";
peerName = modName; peerName = modName;
}else if(modName == "evml") { }
else if(modName == "evml") {
peerId = modElem["sn"].get<string>() + ":evml" + modElem["type"].get<string>() + ":" + to_string(modElem["iid"]); peerId = modElem["sn"].get<string>() + ":evml" + modElem["type"].get<string>() + ":" + to_string(modElem["iid"]);
peerName = modName + modElem["type"].get<string>(); peerName = modName + modElem["type"].get<string>();
}else{ }
else {
peerId = modElem["sn"].get<string>() + ":" + modName + ":" + to_string(modElem["iid"]); peerId = modElem["sn"].get<string>() + ":" + modName + ":" + to_string(modElem["iid"]);
peerName = modName; peerName = modName;
} }
}catch(exception &e) { }
spdlog::error("failed to get gid for {} in {}: {}", modName, modElem.dump(), e.what()); catch(exception &e) {
return -1; spdlog::error("failed to get gid for {} in {}: {}", modName, modElem.dump(), e.what());
} return -1;
}
return 0;
} return 0;
}
json *findModuleConfig(string peerId, json &data) { /// ret["data"] is json array contains gids
json *ret = NULL; /// ret["code"], ["msg"] indicates error if not 0.
auto pp = strutils::split(peerId, ':'); /// ipcIdx: -1 - all IPCS, otherwise - ipc specified by ipcIdx
if(pp.size() != 3) { json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx)
spdlog::error("invalid peerId: {}", peerId); {
return ret; json ret;
} bool hasError = false;
ret["code"] = 0;
string sn = pp[0]; ret["msg"] = "ok";
string modName = pp[1]; ret["data"] = json();
string iid = pp[2]; try {
// // lock_guard<mutex> lock(cacheLock);
string subMn = modName.substr(0,4); string peerId;
if(subMn == "evml") { pid_t pid;
subMn = modName.substr(4, modName.size()); for(auto &[k,v]:data.items()) {
}else{ if(ipcIdx == -1) {
subMn = ""; if(k == sn) {
} peerId = v["sn"].get<string>() + ":evmgr:0";
ret["data"].push_back(peerId);
try{ }
for(auto &[k,v]: data.items()) { }
// startup other submodules
json &ipcs = v["ipcs"];
int idx = 0;
for(auto &ipc : ipcs) {
if(ipcIdx != -1 && idx != ipcIdx) {
continue;
}
json &modules = ipc["modules"];
for(auto &[mn, ml] : modules.items()) {
for(auto &m : ml) {
if(m["sn"] != sn) {
continue;
}
string peerName;
int iret = cfgutils::getPeerId(mn, m, peerId, peerName);
if(iret != 0) {
// 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());
continue;
}
else {
ret["data"].push_back(peerId);
}
}
}
if(ipcIdx != - 1) {
break;
}
idx++;
}
}
}
catch(exception &e) {
string msg = fmt::format("{} getModuleGidsFromCfg exception {} in config {}",caller, sn, e.what(), data.dump());
spdlog::error(msg);
ret["msg"] = msg;
ret["code"] = -1;
}
return ret;
}
json *findModuleConfig(string peerId, json &data)
{
json *ret = NULL;
auto pp = strutils::split(peerId, ':');
if(pp.size() != 3) {
spdlog::error("invalid peerId: {}", peerId);
return ret;
}
string sn = pp[0];
string modName = pp[1];
string iid = pp[2];
//
string subMn = modName.substr(0,4);
if(subMn == "evml") {
subMn = modName.substr(4, modName.size());
}
else {
subMn = "";
}
try {
for(auto &[k,v]: data.items()) {
// it's evmgr // it's evmgr
if(modName == "evmgr") { if(modName == "evmgr") {
if(k == sn) { if(k == sn) {
ret = &v; ret = &v;
break; break;
} }
}else{ }
json &ipcs = v["ipcs"]; else {
json &ipcs = v["ipcs"];
for(auto &ipc: ipcs) {
json &modules = ipc["modules"]; for(auto &ipc: ipcs) {
// not evml json &modules = ipc["modules"];
if(subMn.empty()) { // not evml
if(modules.count(modName) != 0) { if(subMn.empty()) {
json &ml = modules[modName]; if(modules.count(modName) != 0) {
for(auto &m : ml) { json &ml = modules[modName];
if(m["sn"] == sn && to_string(m["iid"]) == iid && m["enabled"] != 0) { for(auto &m : ml) {
ret = &v; if(m["sn"] == sn && to_string(m["iid"]) == iid && m["enabled"] != 0) {
break; ret = &v;
} break;
}
}
} }
} }
}else{ else {
if(modules.count("evml") != 0) { if(modules.count("evml") != 0) {
json &ml = modules["evml"]; json &ml = modules["evml"];
for(auto &m: ml) { for(auto &m: ml) {
if(subMn == m["type"] && to_string(m[iid]) == iid && m["sn"] == sn && m["enabled"] != 0) { if(subMn == m["type"] && to_string(m[iid]) == iid && m["sn"] == sn && m["enabled"] != 0) {
ret = &v; ret = &v;
break; break;
} }
}
} }
} }
}
if(ret != NULL) break;
if(ret != NULL) break; }
}
} }
} }
}catch(exception &e) { }
spdlog::error("find module {} in {} exception: {}", peerId, data.dump(), e.what()); catch(exception &e) {
return NULL; spdlog::error("find module {} in {} exception: {}", peerId, data.dump(), e.what());
} return NULL;
}
return ret;
} return ret;
}
/// return json key: gid; value: 0 - stop, 1 - start, 3 - restart
json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, string sn) { /// return json key: gid; value: 0 - stop, 1 - start, 3 - restart
json ret; json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, string sn)
ret["code"] = 0; {
ret["msg"] = "ok"; json ret;
ret["data"] = json(); ret["code"] = 0;
bool hasError = false; ret["msg"] = "ok";
spdlog::info("matching {}, size:{}, type:{}", diff.dump(), diff.size(), diff.type_name()); ret["data"] = json();
try{ bool hasError = false;
for(auto &d: diff) { spdlog::info("matching {}, size:{}, type:{}", diff.dump(), diff.size(), diff.type_name());
try {
for(auto &d: diff) {
spdlog::info("d :{}, {}", d.dump(), d.size()); spdlog::info("d :{}, {}", d.dump(), d.size());
if(d.count("path") != 0) { if(d.count("path") != 0) {
string path_ = d["path"]; string path_ = d["path"];
bool matched = false; bool matched = false;
// match ipc config // match ipc config
// eg: /NMXH73Y2/ipcs/0/addr // eg: /NMXH73Y2/ipcs/0/addr
// \\w+ could be: addr, user, password, port // \\w+ could be: addr, user, password, port
set<string> oprations{"add", "replace", "remove"}; set<string> oprations{"add", "replace", "remove"};
set<string> pullerTag{"addr", "user", "password", "proto", "port" /*, "sn"*/}; set<string> pullerTag{"addr", "user", "password", "proto", "port" /*, "sn"*/};
string ipcRegStr = "/(\\w+)/ipcs/(\\d+)/(\\w+)"; string ipcRegStr = "/(\\w+)/ipcs/(\\d+)/(\\w+)";
std::smatch results; std::smatch results;
std::regex ipcRegex(ipcRegStr); std::regex ipcRegex(ipcRegStr);
if (std::regex_match(path_, results, ipcRegex)) { if (std::regex_match(path_, results, ipcRegex)) {
if (results.size() == 4) { if (results.size() == 4) {
matched = true; matched = true;
string mgrSn = results[1].str(); string mgrSn = results[1].str();
int ipcIdx = stoi(results[2].str()); int ipcIdx = stoi(results[2].str());
string tag = results[3].str(); string tag = results[3].str();
if(pullerTag.find(tag) != pullerTag.end()) { if(pullerTag.find(tag) != pullerTag.end()) {
// TODO: op = remove // TODO: op = remove
if(d["op"] == "add" || d["op"] == "replace") { if(d["op"] == "add" || d["op"] == "replace") {
// start // start
auto ipc = newConfig[mgrSn]["ipcs"][ipcIdx]; auto ipc = newConfig[mgrSn]["ipcs"][ipcIdx];
auto ipcOld = oldConfig[mgrSn]["ipcs"][ipcIdx]; auto ipcOld = oldConfig[mgrSn]["ipcs"][ipcIdx];
if(ipc.count("modules") == 0 || ipc["modules"].size() == 0 || ipc["moudles"].count("evpuller") ==0 || ipc["modules"]["evpuller"].size() == 0 ) { if(ipc.count("modules") == 0 || ipc["modules"].size() == 0 || ipc["moudles"].count("evpuller") ==0 || ipc["modules"]["evpuller"].size() == 0 ) {
string msg = fmt::format("invalid config for ipc[{}]['modules']['evpuller']: {}", ipcIdx, newConfig.dump()); string msg = fmt::format("invalid config for ipc[{}]['modules']['evpuller']: {}", ipcIdx, newConfig.dump());
spdlog::error(msg); spdlog::error(msg);
ret["msg"] = msg; ret["msg"] = msg;
hasError = true; hasError = true;
break; break;
}else{ }
else {
auto &evpullers = ipc["module"]["evpuller"]; auto &evpullers = ipc["module"]["evpuller"];
int idx = 0; int idx = 0;
for(auto &puller:evpullers) { for(auto &puller:evpullers) {
// strutil // strutil
if(puller.count("sn") == 0) { if(puller.count("sn") == 0) {
string msg = fmt::format("invalid config for ipc[{}]['modules']['evpuller'][{}] no sn field: {}", ipcIdx, idx, newConfig.dump()); string msg = fmt::format("invalid config for ipc[{}]['modules']['evpuller'][{}] no sn field: {}", ipcIdx, idx, newConfig.dump());
ret["msg"] = msg; ret["msg"] = msg;
spdlog::error(msg); spdlog::error(msg);
hasError = true; hasError = true;
break; break;
} }
if(puller["sn"].get<string>() != sn) { if(puller["sn"].get<string>() != sn) {
spdlog::debug("skip {} for expecting sn: {}", puller.dump(), sn); spdlog::debug("skip {} for expecting sn: {}", puller.dump(), sn);
continue; continue;
} }
if(puller.count("iid") == 0 || puller.count("addr") == 0) { if(puller.count("iid") == 0 || puller.count("addr") == 0) {
string msg = fmt::format("invliad config as of having no iid/addr/enabled field in ipc[{}]['modules']['evpuller'][{}]: {}", ipcIdx, idx, newConfig.dump()); string msg = fmt::format("invliad config as of having no iid/addr/enabled field in ipc[{}]['modules']['evpuller'][{}]: {}", ipcIdx, idx, newConfig.dump());
spdlog::error(msg); spdlog::error(msg);
ret["msg"] = msg; ret["msg"] = msg;
hasError = true; hasError = true;
break; break;
}else{ }
string gid = sn + ":evpuller:" + to_string(puller["iid"].get<int>()); else {
if(puller.count("enabled") == 0 || puller["enabled"].get<int>() == 0) { string gid = sn + ":evpuller:" + to_string(puller["iid"].get<int>());
if(puller.count("enabled") == 0 || puller["enabled"].get<int>() == 0) {
ret["data"][gid] = 0; // stop ret["data"][gid] = 0; // stop
}else{ }
else {
ret["data"][gid] = 2; ret["data"][gid] = 2;
} }
} }
idx++; idx++;
} }
} }
} }
} }
} }
} }
// else{ // else{
// spdlog::info("no match for ipc", path_); // spdlog::info("no match for ipc", path_);
// } // }
// match module config // match module config
if(!matched && !hasError) { if(!matched && !hasError) {
// /NMXH73Y2/ipcs/0/modules/evpusher/0/urlDest // /NMXH73Y2/ipcs/0/modules/evpusher/0/urlDest
string moduleRegStr = "/(\\w+)/ipcs/(\\d+)/modules/(\\w+)/(\\d+)/(\\w+)"; string moduleRegStr = "/(\\w+)/ipcs/(\\d+)/modules/(\\w+)/(\\d+)/(\\w+)";
std::regex moduleRegex(moduleRegStr); std::regex moduleRegex(moduleRegStr);
std::smatch results; std::smatch results;
if (std::regex_match(path_, results, moduleRegex)) { if (std::regex_match(path_, results, moduleRegex)) {
if (results.size() == 6) { if (results.size() == 6) {
matched = true; matched = true;
string mgrSn = results[1].str(); string mgrSn = results[1].str();
int ipcIdx = stoi(results[2].str()); int ipcIdx = stoi(results[2].str());
int modIdx = stoi(results[4].str()); int modIdx = stoi(results[4].str());
string modName = results[3].str(); string modName = results[3].str();
string propName = results[5].str(); string propName = results[5].str();
if(d["op"] == "replace"||d["op"] == "add" || d["op"] == "remove") { if(d["op"] == "replace"||d["op"] == "add" || d["op"] == "remove") {
auto &oldMod = oldConfig[mgrSn]["ipcs"][ipcIdx]["modules"][modName][modIdx]; auto &oldMod = oldConfig[mgrSn]["ipcs"][ipcIdx]["modules"][modName][modIdx];
auto &newMod = newConfig[mgrSn]["ipcs"][ipcIdx]["modules"][modName][modIdx]; auto &newMod = newConfig[mgrSn]["ipcs"][ipcIdx]["modules"][modName][modIdx];
if(oldMod.count("iid") == 0 || newMod.count("iid") == 0) { if(oldMod.count("iid") == 0 || newMod.count("iid") == 0) {
string msg = fmt::format("invalid module config ipcs[{}]['modules'][{}][{}] having no iid field", ipcIdx, modName, modIdx); string msg = fmt::format("invalid module config ipcs[{}]['modules'][{}][{}] having no iid field", ipcIdx, modName, modIdx);
spdlog::error(msg); spdlog::error(msg);
ret["msg"] = msg; ret["msg"] = msg;
hasError = true; hasError = true;
break; break;
}else{ }
else {
if(modName == "evml") { if(modName == "evml") {
if(newMod.count("type") == 0) { if(newMod.count("type") == 0) {
string msg = fmt::format("invalid evml module config ipcs[{}]['modules'][{}][{}] having no type field", ipcIdx, modName, modIdx); string msg = fmt::format("invalid evml module config ipcs[{}]['modules'][{}][{}] having no type field", ipcIdx, modName, modIdx);
spdlog::error(msg); spdlog::error(msg);
hasError = true; hasError = true;
break; break;
}else{ }
modName = modName + newMod["type"].get<string>(); else {
} modName = modName + newMod["type"].get<string>();
}
} }
if(newMod.count("sn") == 0) { if(newMod.count("sn") == 0) {
string msg = fmt::format("invalid module config ipcs[{}]['modules'][{}][{}] having no sn field", ipcIdx, modName, modIdx); string msg = fmt::format("invalid module config ipcs[{}]['modules'][{}][{}] having no sn field", ipcIdx, modName, modIdx);
spdlog::error(msg); spdlog::error(msg);
hasError = true; hasError = true;
break; break;
} }
if(newMod["sn"].get<string>() != sn && oldMod.count("sn") != 0 && oldMod["sn"].get<string>() == sn) { if(newMod["sn"].get<string>() != sn && oldMod.count("sn") != 0 && oldMod["sn"].get<string>() == sn) {
string oldGid = sn + ":" + modName + ":" + to_string(oldMod["iid"].get<int>()); string oldGid = sn + ":" + modName + ":" + to_string(oldMod["iid"].get<int>());
ret["data"][oldGid] = 0; ret["data"][oldGid] = 0;
continue; continue;
}else if(newMod["sn"].get<string>() != sn && (oldMod.count("sn") == 0 ||(oldMod.count("sn") != 0 && oldMod["sn"].get<string>() != sn))){ }
// ignore else if(newMod["sn"].get<string>() != sn && (oldMod.count("sn") == 0 ||(oldMod.count("sn") != 0 && oldMod["sn"].get<string>() != sn))) {
continue; // ignore
}else{ continue;
// oldSn == newSn == sn, below }
else {
// oldSn == newSn == sn, below
} }
string oldGid = sn + ":" + modName + ":" + to_string(oldMod["iid"].get<int>()); string oldGid = sn + ":" + modName + ":" + to_string(oldMod["iid"].get<int>());
string newGid = sn + ":" + modName + ":" + to_string(newMod["iid"].get<int>()); string newGid = sn + ":" + modName + ":" + to_string(newMod["iid"].get<int>());
if(oldGid != newGid) { if(oldGid != newGid) {
ret["data"][oldGid] = 0; ret["data"][oldGid] = 0;
} }
if(propName == "enabled") { if(propName == "enabled") {
if(newMod.count("enabled") == 0||newMod["enabled"].get<int>() == 0) { if(newMod.count("enabled") == 0||newMod["enabled"].get<int>() == 0) {
ret["data"][newGid] = 0; ret["data"][newGid] = 0;
}else{ }
ret["data"][newGid] = 1; else {
} ret["data"][newGid] = 1;
}else{ // other prop modification }
// it was disabled. just ignore }
if(ret["data"].count(newGid) != 0 && ret["data"][newGid].get<int>() == 0) { else { // other prop modification
// nop // it was disabled. just ignore
}else{ if(ret["data"].count(newGid) != 0 && ret["data"][newGid].get<int>() == 0) {
// restart // nop
ret["data"][newGid] = 2; }
} else {
// restart
ret["data"][newGid] = 2;
}
} }
} }
} }
} }
} }
// else{ // else{
// spdlog::info("no match for module {}", path_); // spdlog::info("no match for module {}", path_);
// } // }
} }
// whole submodule // whole submodule
if(!matched && !hasError) { if(!matched && !hasError) {
// /PSBV7GKN/ipcs/0/modules/evpusher/0 // /PSBV7GKN/ipcs/0/modules/evpusher/0
// {"enabled":0,"iid":1,"password":"","sn":"PSBV7GKN","token":"","urlDest":"rtsp://40.73.41.176/PSBV7GKN","user":""} // {"enabled":0,"iid":1,"password":"","sn":"PSBV7GKN","token":"","urlDest":"rtsp://40.73.41.176/PSBV7GKN","user":""}
string moduleRegStr = "/(\\w+)/ipcs/(\\d+)/modules/(\\w+)/(\\d+)"; string moduleRegStr = "/(\\w+)/ipcs/(\\d+)/modules/(\\w+)/(\\d+)";
std::regex moduleRegex(moduleRegStr); std::regex moduleRegex(moduleRegStr);
std::smatch results; std::smatch results;
if (std::regex_match(path_, results, moduleRegex)) { if (std::regex_match(path_, results, moduleRegex)) {
if (results.size() == 5) { if (results.size() == 5) {
matched = true; matched = true;
string mgrSn = results[1].str(); string mgrSn = results[1].str();
int ipcIdx = stoi(results[2].str()); int ipcIdx = stoi(results[2].str());
int modIdx = stoi(results[4].str()); int modIdx = stoi(results[4].str());
string modName = results[3].str(); string modName = results[3].str();
json modObj; json modObj;
if(d["op"] == "remove") { if(d["op"] == "remove") {
modObj = oldConfig[mgrSn]["ipcs"][ipcIdx]["modules"][modName][modIdx]; modObj = oldConfig[mgrSn]["ipcs"][ipcIdx]["modules"][modName][modIdx];
}else{ }
modObj = newConfig[mgrSn]["ipcs"][ipcIdx]["modules"][modName][modIdx]; else {
} modObj = newConfig[mgrSn]["ipcs"][ipcIdx]["modules"][modName][modIdx];
if(modObj.count("sn") == 0) { }
if(d["op"] != "remove"){ if(modObj.count("sn") == 0) {
if(d["op"] != "remove") {
string msg = fmt::format("invalid modue config having no sn /{}/ipcs/{}/modules/{}/{}", mgrSn, ipcIdx, modName, modIdx); string msg = fmt::format("invalid modue config having no sn /{}/ipcs/{}/modules/{}/{}", mgrSn, ipcIdx, modName, modIdx);
spdlog::error(msg); spdlog::error(msg);
hasError = true; hasError = true;
ret["msg"] = msg; ret["msg"] = msg;
break; break;
}else{ }
else {
// nop // nop
} }
}else{ }
if(modObj["sn"].get<string>() == sn){ else {
if(modObj["sn"].get<string>() == sn) {
if(modName == "evml") { if(modName == "evml") {
if(modObj.count("type") == 0) { if(modObj.count("type") == 0) {
string msg = fmt::format("invalid evml module config ipcs[{}]['modules'][{}][{}] having no type field", ipcIdx, modName, modIdx); string msg = fmt::format("invalid evml module config ipcs[{}]['modules'][{}][{}] having no type field", ipcIdx, modName, modIdx);
spdlog::error(msg); spdlog::error(msg);
hasError = true; hasError = true;
break; break;
}else{ }
modName = modName + modObj["type"].get<string>(); else {
} modName = modName + modObj["type"].get<string>();
}
} }
if(modObj.count("iid") == 0) { if(modObj.count("iid") == 0) {
string msg = fmt::format("invalid evml module config ipcs[{}]['modules'][{}][{}] having no iid field", ipcIdx, modName, modIdx); string msg = fmt::format("invalid evml module config ipcs[{}]['modules'][{}][{}] having no iid field", ipcIdx, modName, modIdx);
spdlog::error(msg); spdlog::error(msg);
hasError = true; hasError = true;
break; break;
} }
string modGid = sn + ":" + modName + ":" + to_string(modObj["iid"].get<int>()); string modGid = sn + ":" + modName + ":" + to_string(modObj["iid"].get<int>());
if(d["op"] == "remove") { if(d["op"] == "remove") {
ret["data"][modGid] = 0; ret["data"][modGid] = 0;
}else{
ret["data"][modGid] = 1;
} }
}else{ else {
ret["data"][modGid] = 1;
}
}
else {
// nop // nop
} }
} }
}
}
}
// whole cluster
if(!matched && !hasError) {
// /PSBV7GKN
// "value":{"addr":"127.0.0.1","api-cloud":"http://127.0.0.1:8089","ipcs":[{"addr":"172.31.0.129","modules":{"evml":[{"area":200,"enabled":1,"entropy":0.3,"iid":1,"post":30,"pre":3,"sn":"PSBV7GKN","thresh":30,"type":"motion"}],"evpuller":[{"addr":"127.0.0.1","enabled":1,"iid":1,"port-pub":5556,"sn":"PSBV7GKN"}],"evpusher":[{"enabled":0,"iid":1,"password":"","sn":"PSBV7GKN","token":"","urlDest":"rtsp://40.73.41.176/PSBV7GKN","user":""}],"evslicer":[{"enabled":1,"iid":1,"path":"slices","sn":"PSBV7GKN","video-server-addr":"http://40.73.41.176:10009/upload/evtvideos/"}]},"password":"iLabService","port":554,"proto":"rtsp","sn":"iLabService","user":"admin"}],"mqtt-cloud":"<cloud_addr>","port-cloud":5556,"port-router":5550,"proto":"zmq","sn":"PSBV7GKN"}
string clusterRegStr = "/(\\w+)";
std::regex clusterRegex(clusterRegStr);
std::smatch results;
if (std::regex_match(path_, results, clusterRegex)) {
if (results.size() == 2) {
matched = true;
string mgrSn = results[1].str();
json mgr;
if(d["op"] == "remove") {
mgr[mgrSn] = oldConfig[mgrSn];
}
else {
mgr[mgrSn] = newConfig[mgrSn];
}
json jret = cfgutils::getModuleGidsFromCfg(sn, mgr, "getModulesOperFromConfDiff");
spdlog::info("jret: {}", jret.dump());
if(jret["code"] != 0) {
ret["msg"] = jret["msg"];
hasError = true;
break;
}
else {
for(auto &k: jret["data"]) {
if(d["op"] == "remove") {
ret["data"][string(k)] = 0;
}
else {
ret["data"][string(k)] = 2;
}
}
}
} }
}
} }
}
// one ipc
if(hasError){ if(!matched && !hasError) {
ret["code"] = 1; // /PSBV7GKN/ipcs/0"
break; // {"addr":"172.31.0.129","modules":{"evml":[{"area":200,"enabled":1,"entropy":0.3,"iid":1,"post":30,"pre":3,"sn":"PSBV7GKN","thresh":30,"type":"motion"}],"evpuller":[{"addr":"127.0.0.1","enabled":1,"iid":1,"port-pub":5556,"sn":"PSBV7GKN"}],"evpusher":[{"enabled":0,"iid":1,"password":"","sn":"PSBV7GKN","token":"","urlDest":"rtsp://40.73.41.176/PSBV7GKN","user":""}],"evslicer":[{"enabled":1,"iid":1,"path":"slices","sn":"PSBV7GKN","video-server-addr":"http://40.73.41.176:10009/upload/evtvideos/"}]},"password":"iLabService","port":554,"proto":"rtsp","sn":"iLabService","user":"admin"}
} string clusterRegStr = "/(\\w+)/ipcs/(\\d+)";
std::regex clusterRegex(clusterRegStr);
std::smatch results;
if (std::regex_match(path_, results, clusterRegex)) {
if (results.size() == 3) {
matched = true;
string mgrSn = results[1].str();
int ipcIdx = stoi(results[2].str());
json mgr;
if(d["op"] == "remove") {
mgr[mgrSn] = oldConfig[mgrSn];
}
else {
mgr[mgrSn] = newConfig[mgrSn];
}
json jret = cfgutils::getModuleGidsFromCfg(sn, mgr, "getModulesOperFromConfDiff", ipcIdx);
spdlog::info("jret: {}", jret.dump());
if(jret["code"] != 0) {
ret["msg"] = jret["msg"];
hasError = true;
break;
}
else {
for(auto &k: jret["data"]) {
if(d["op"] == "remove") {
ret["data"][string(k)] = 0;
}
else {
ret["data"][string(k)] = 2;
}
}
}
}
}
}
} }
} }
}catch(exception &e) { if(hasError) {
spdlog::error("getModulesOperFromConfDiff exception: {}", e.what()); ret["code"] = 1;
ret["code"] = -1; }
ret["msg"] = e.what(); }
} catch(exception &e) {
spdlog::error("getModulesOperFromConfDiff exception: {}", e.what());
return ret; ret["code"] = -1;
} ret["msg"] = e.what();
}
return ret;
}
} // cfgutils } // cfgutils
opencv-motion-detect/inc/utils.hpp
浏览文件 @ f981a53a
...@@ -46,6 +46,7 @@ namespace cfgutils { ...@@ -46,6 +46,7 @@ namespace cfgutils {
int getPeerId(string modName, json& modElem, string &peerId, string &peerName); int getPeerId(string modName, json& modElem, string &peerId, string &peerName);
json *findModuleConfig(string peerId, json &data); json *findModuleConfig(string peerId, json &data);
json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, string sn); json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, string sn);
json getModuleGidsFromCfg(string sn, json &data, string caller = "", int ipcIdx = -1);
} }
struct StrException : public std::exception struct StrException : public std::exception
......
opencv-motion-detect/test_regex.cpp
浏览文件 @ f981a53a
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "json.hpp" #include "json.hpp"
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <fmt/format.h> #include <fmt/format.h>
#include "utils.hpp"
using namespace std; using namespace std;
using namespace nlohmann; using namespace nlohmann;
...@@ -241,16 +242,88 @@ json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, st ...@@ -241,16 +242,88 @@ json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, st
} }
} }
} }
} }
} }
if(hasError){ // whole cluster
ret["code"] = 1; if(!matched && !hasError) {
break; // /PSBV7GKN
} // "value":{"addr":"127.0.0.1","api-cloud":"http://127.0.0.1:8089","ipcs":[{"addr":"172.31.0.129","modules":{"evml":[{"area":200,"enabled":1,"entropy":0.3,"iid":1,"post":30,"pre":3,"sn":"PSBV7GKN","thresh":30,"type":"motion"}],"evpuller":[{"addr":"127.0.0.1","enabled":1,"iid":1,"port-pub":5556,"sn":"PSBV7GKN"}],"evpusher":[{"enabled":0,"iid":1,"password":"","sn":"PSBV7GKN","token":"","urlDest":"rtsp://40.73.41.176/PSBV7GKN","user":""}],"evslicer":[{"enabled":1,"iid":1,"path":"slices","sn":"PSBV7GKN","video-server-addr":"http://40.73.41.176:10009/upload/evtvideos/"}]},"password":"iLabService","port":554,"proto":"rtsp","sn":"iLabService","user":"admin"}],"mqtt-cloud":"<cloud_addr>","port-cloud":5556,"port-router":5550,"proto":"zmq","sn":"PSBV7GKN"}
string clusterRegStr = "/(\\w+)";
std::regex clusterRegex(clusterRegStr);
std::smatch results;
if (std::regex_match(path_, results, clusterRegex)) {
if (results.size() == 2) {
matched = true;
string mgrSn = results[1].str();
json mgr;
if(d["op"] == "remove"){
mgr[mgrSn] = oldConfig[mgrSn];
}else{
mgr[mgrSn] = newConfig[mgrSn];
}
json jret = cfgutils::getModuleGidsFromCfg(sn, mgr, "getModulesOperFromConfDiff");
spdlog::info("jret: {}", jret.dump());
if(jret["code"] != 0) {
ret["msg"] = jret["msg"];
hasError = true;
break;
}else{
for(auto &k: jret["data"]) {
if(d["op"] == "remove"){
ret["data"][string(k)] = 0;
}else{
ret["data"][string(k)] = 2;
}
}
}
}
}
}
// one ipc
if(!matched && !hasError) {
// /PSBV7GKN/ipcs/0"
// {"addr":"172.31.0.129","modules":{"evml":[{"area":200,"enabled":1,"entropy":0.3,"iid":1,"post":30,"pre":3,"sn":"PSBV7GKN","thresh":30,"type":"motion"}],"evpuller":[{"addr":"127.0.0.1","enabled":1,"iid":1,"port-pub":5556,"sn":"PSBV7GKN"}],"evpusher":[{"enabled":0,"iid":1,"password":"","sn":"PSBV7GKN","token":"","urlDest":"rtsp://40.73.41.176/PSBV7GKN","user":""}],"evslicer":[{"enabled":1,"iid":1,"path":"slices","sn":"PSBV7GKN","video-server-addr":"http://40.73.41.176:10009/upload/evtvideos/"}]},"password":"iLabService","port":554,"proto":"rtsp","sn":"iLabService","user":"admin"}
string clusterRegStr = "/(\\w+)/ipcs/(\\d+)";
std::regex clusterRegex(clusterRegStr);
std::smatch results;
if (std::regex_match(path_, results, clusterRegex)) {
if (results.size() == 3) {
matched = true;
string mgrSn = results[1].str();
int ipcIdx = stoi(results[2].str());
json mgr;
if(d["op"] == "remove"){
mgr[mgrSn] = oldConfig[mgrSn];
}else{
mgr[mgrSn] = newConfig[mgrSn];
}
json jret = cfgutils::getModuleGidsFromCfg(sn, mgr, "getModulesOperFromConfDiff", ipcIdx);
spdlog::info("jret: {}", jret.dump());
if(jret["code"] != 0) {
ret["msg"] = jret["msg"];
hasError = true;
break;
}else{
for(auto &k: jret["data"]) {
if(d["op"] == "remove"){
ret["data"][string(k)] = 0;
}else{
ret["data"][string(k)] = 2;
}
}
}
}
}
}
} }
} }
if(hasError){
ret["code"] = 1;
}
}catch(exception &e) { }catch(exception &e) {
spdlog::error("getModulesOperFromConfDiff exception: {}", e.what()); spdlog::error("getModulesOperFromConfDiff exception: {}", e.what());
ret["code"] = -1; ret["code"] = -1;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论