Skip to content

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

refactor of delta config

上级 217dce32
显示空白字符变更
内嵌 并排
正在显示 包含 302 行增加 和 51 行删除
opencv-motion-detect/inc/utils.cpp
浏览文件 @ f981a53a
......@@ -2,13 +2,13 @@
// cloudutils
namespace cloudutils
{
namespace cloudutils {
/// [deprecated] ref: ../config.json
json registry(json &conf, string sn, string module) {
json registry(json &conf, string sn, string module)
{
json ret;
string api;
try{
try {
api = conf.at("data").at(sn).at("api-cloud").get<string>() + "/register";
Uri uri=Uri::Parse(api);
if(uri.Host.empty()||uri.Port.empty()||uri.Protocol.find("http") == string::npos||uri.Path.empty()) {
......@@ -27,7 +27,8 @@ json registry(json &conf, string sn, string module) {
auto res = cli.Post("/register", Headers(), params, conf.dump(), "text/json");
spdlog::debug("{} {} registry res from cloud : {}", __FILE__, __LINE__, res->body);
ret = json::parse(res->body);
}catch(exception &e) {
}
catch(exception &e) {
ret["code"] = -1;
string msg = string(__FILE__) + ":" + to_string(__LINE__) + string(": registry exception - ") + e.what();
ret["msg"] = msg;
......@@ -39,10 +40,11 @@ json registry(json &conf, string sn, string module) {
}
/// req config
json reqConfig(json &info){
json reqConfig(json &info)
{
json ret;
string api;
try{
try {
api = info.at("api-cloud").get<string>();
Uri uri=Uri::Parse(api);
string sn = info.at("sn").get<string>();
......@@ -64,17 +66,20 @@ json reqConfig(json &info){
if(res == nullptr) {
msg = (string("error to connect to server: ") + api + "/config").c_str();
ret["code"] = EVCLOUD_REQ_E_CONN;
}else{
}
else {
msg = httplib::detail::status_message(res->status);
ret["code"] = res->status;
}
spdlog::debug("failed to reqConfig. {}", msg);
ret["msg"] = msg;
}else{
}
else {
spdlog::debug("{} {} registry res from cloud : {}", __FILE__, __LINE__, res->body);
ret = json::parse(res->body);
}
}catch(exception &e) {
}
catch(exception &e) {
ret["code"] = EVCLOUD_REQ_E_DATA;
string msg = string(__FILE__) + ":" + to_string(__LINE__) + string(": registry exception - ") + e.what();
ret["msg"] = msg;
......@@ -89,14 +94,13 @@ json reqConfig(json &info){
///
namespace strutils{
namespace strutils {
vector<string> split(const std::string& s, char delimiter)
{
std::vector<std::string> tokens;
std::string token;
std::istringstream tokenStream(s);
while (getline(tokenStream, token, delimiter))
{
while (getline(tokenStream, token, delimiter)) {
tokens.push_back(token);
}
return tokens;
......@@ -105,28 +109,101 @@ vector<string> split(const std::string& s, char delimiter)
}//namespace strutils
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") {
peerId = modElem["sn"].get<string>() + ":evmgr:0";
peerName = modName;
}else if(modName == "evml") {
}
else if(modName == "evml") {
peerId = modElem["sn"].get<string>() + ":evml" + modElem["type"].get<string>() + ":" + to_string(modElem["iid"]);
peerName = modName + modElem["type"].get<string>();
}else{
}
else {
peerId = modElem["sn"].get<string>() + ":" + modName + ":" + to_string(modElem["iid"]);
peerName = modName;
}
}catch(exception &e) {
}
catch(exception &e) {
spdlog::error("failed to get gid for {} in {}: {}", modName, modElem.dump(), e.what());
return -1;
}
return 0;
}
/// ret["data"] is json array contains gids
/// ret["code"], ["msg"] indicates error if not 0.
/// ipcIdx: -1 - all IPCS, otherwise - ipc specified by ipcIdx
json getModuleGidsFromCfg(string sn, json &data, string caller, int ipcIdx)
{
json ret;
bool hasError = false;
ret["code"] = 0;
ret["msg"] = "ok";
ret["data"] = json();
try {
// lock_guard<mutex> lock(cacheLock);
string peerId;
pid_t pid;
for(auto &[k,v]:data.items()) {
if(ipcIdx == -1) {
if(k == sn) {
peerId = v["sn"].get<string>() + ":evmgr:0";
ret["data"].push_back(peerId);
}
}
// 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;
}
json *findModuleConfig(string peerId, json &data) {
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) {
......@@ -141,11 +218,12 @@ namespace cfgutils {
string subMn = modName.substr(0,4);
if(subMn == "evml") {
subMn = modName.substr(4, modName.size());
}else{
}
else {
subMn = "";
}
try{
try {
for(auto &[k,v]: data.items()) {
// it's evmgr
if(modName == "evmgr") {
......@@ -153,7 +231,8 @@ namespace cfgutils {
ret = &v;
break;
}
}else{
}
else {
json &ipcs = v["ipcs"];
for(auto &ipc: ipcs) {
......@@ -169,7 +248,8 @@ namespace cfgutils {
}
}
}
}else{
}
else {
if(modules.count("evml") != 0) {
json &ml = modules["evml"];
for(auto &m: ml) {
......@@ -185,23 +265,25 @@ namespace cfgutils {
}
}
}
}catch(exception &e) {
}
catch(exception &e) {
spdlog::error("find module {} in {} exception: {}", peerId, data.dump(), e.what());
return NULL;
}
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 getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, string sn)
{
json ret;
ret["code"] = 0;
ret["msg"] = "ok";
ret["data"] = json();
bool hasError = false;
spdlog::info("matching {}, size:{}, type:{}", diff.dump(), diff.size(), diff.type_name());
try{
try {
for(auto &d: diff) {
spdlog::info("d :{}, {}", d.dump(), d.size());
if(d.count("path") != 0) {
......@@ -234,7 +316,8 @@ namespace cfgutils {
ret["msg"] = msg;
hasError = true;
break;
}else{
}
else {
auto &evpullers = ipc["module"]["evpuller"];
int idx = 0;
for(auto &puller:evpullers) {
......@@ -258,11 +341,13 @@ namespace cfgutils {
ret["msg"] = msg;
hasError = true;
break;
}else{
}
else {
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
}else{
}
else {
ret["data"][gid] = 2;
}
}
......@@ -300,14 +385,16 @@ namespace cfgutils {
ret["msg"] = msg;
hasError = true;
break;
}else{
}
else {
if(modName == "evml") {
if(newMod.count("type") == 0) {
string msg = fmt::format("invalid evml module config ipcs[{}]['modules'][{}][{}] having no type field", ipcIdx, modName, modIdx);
spdlog::error(msg);
hasError = true;
break;
}else{
}
else {
modName = modName + newMod["type"].get<string>();
}
}
......@@ -323,10 +410,12 @@ namespace cfgutils {
string oldGid = sn + ":" + modName + ":" + to_string(oldMod["iid"].get<int>());
ret["data"][oldGid] = 0;
continue;
}else if(newMod["sn"].get<string>() != sn && (oldMod.count("sn") == 0 ||(oldMod.count("sn") != 0 && oldMod["sn"].get<string>() != sn))){
}
else if(newMod["sn"].get<string>() != sn && (oldMod.count("sn") == 0 ||(oldMod.count("sn") != 0 && oldMod["sn"].get<string>() != sn))) {
// ignore
continue;
}else{
}
else {
// oldSn == newSn == sn, below
}
......@@ -340,14 +429,17 @@ namespace cfgutils {
if(propName == "enabled") {
if(newMod.count("enabled") == 0||newMod["enabled"].get<int>() == 0) {
ret["data"][newGid] = 0;
}else{
}
else {
ret["data"][newGid] = 1;
}
}else{ // other prop modification
}
else { // other prop modification
// it was disabled. just ignore
if(ret["data"].count(newGid) != 0 && ret["data"][newGid].get<int>() == 0) {
// nop
}else{
}
else {
// restart
ret["data"][newGid] = 2;
}
......@@ -378,28 +470,32 @@ namespace cfgutils {
json modObj;
if(d["op"] == "remove") {
modObj = oldConfig[mgrSn]["ipcs"][ipcIdx]["modules"][modName][modIdx];
}else{
}
else {
modObj = newConfig[mgrSn]["ipcs"][ipcIdx]["modules"][modName][modIdx];
}
if(modObj.count("sn") == 0) {
if(d["op"] != "remove"){
if(d["op"] != "remove") {
string msg = fmt::format("invalid modue config having no sn /{}/ipcs/{}/modules/{}/{}", mgrSn, ipcIdx, modName, modIdx);
spdlog::error(msg);
hasError = true;
ret["msg"] = msg;
break;
}else{
}
else {
// nop
}
}else{
if(modObj["sn"].get<string>() == sn){
}
else {
if(modObj["sn"].get<string>() == sn) {
if(modName == "evml") {
if(modObj.count("type") == 0) {
string msg = fmt::format("invalid evml module config ipcs[{}]['modules'][{}][{}] having no type field", ipcIdx, modName, modIdx);
spdlog::error(msg);
hasError = true;
break;
}else{
}
else {
modName = modName + modObj["type"].get<string>();
}
}
......@@ -414,30 +510,111 @@ namespace cfgutils {
string modGid = sn + ":" + modName + ":" + to_string(modObj["iid"].get<int>());
if(d["op"] == "remove") {
ret["data"][modGid] = 0;
}else{
}
else {
ret["data"][modGid] = 1;
}
}else{
}
else {
// 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];
}
if(hasError){
ret["code"] = 1;
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;
}
}
}
}
}
}
}catch(exception &e) {
}
}
if(hasError) {
ret["code"] = 1;
}
}
catch(exception &e) {
spdlog::error("getModulesOperFromConfDiff exception: {}", e.what());
ret["code"] = -1;
ret["msg"] = e.what();
}
return ret;
}
}
} // cfgutils
opencv-motion-detect/inc/utils.hpp
浏览文件 @ f981a53a
......@@ -46,6 +46,7 @@ namespace cfgutils {
int getPeerId(string modName, json& modElem, string &peerId, string &peerName);
json *findModuleConfig(string peerId, json &data);
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
......
opencv-motion-detect/test_regex.cpp
浏览文件 @ f981a53a
......@@ -8,6 +8,7 @@
#include "json.hpp"
#include <spdlog/spdlog.h>
#include <fmt/format.h>
#include "utils.hpp"
using namespace std;
using namespace nlohmann;
......@@ -241,16 +242,88 @@ json getModulesOperFromConfDiff(json& oldConfig, json &newConfig, json &diff, st
}
}
}
}
}
// 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;
}
}
}
}
}
}
if(hasError){
ret["code"] = 1;
// 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) {
spdlog::error("getModulesOperFromConfDiff exception: {}", e.what());
ret["code"] = -1;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论