Skip to content

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

big refacting of communitation architect

上级 f7bf2611
隐藏空白字符变更
内嵌 并排
正在显示 包含 98 行增加 和 84 行删除
opencv-motion-detect/config.json
浏览文件 @ 9332d045
{
"data":{
"8OK2ZDXP":{
"NMXH73Y2":{
"addr":"127.0.0.1",
"api-cloud":"http://127.0.0.1:8089",
"ipcs":[
......@@ -14,7 +14,7 @@
"iid":1,
"post":30,
"pre":3,
"sn":"8OK2ZDXP",
"sn":"NMXH73Y2",
"status":0,
"thresh":80,
"type":"motion"
......@@ -25,7 +25,7 @@
"addr":"127.0.0.1",
"iid":1,
"port-pub":5556,
"sn":"8OK2ZDXP",
"sn":"NMXH73Y2",
"status":0
}
],
......@@ -34,7 +34,7 @@
"enabled":1,
"iid":1,
"password":"",
"sn":"8OK2ZDXP",
"sn":"NMXH73Y2",
"status":0,
"token":"",
"urlDest":"rtsp://40.73.41.176:554/test1",
......@@ -46,7 +46,7 @@
"enabled":1,
"iid":1,
"path":"slices",
"sn":"8OK2ZDXP",
"sn":"NMXH73Y2",
"status":0
}
]
......@@ -62,7 +62,7 @@
"port-cloud":5556,
"port-router":5550,
"proto":"zmq",
"sn":"8OK2ZDXP",
"sn":"NMXH73Y2",
"status":1
}
},
......
opencv-motion-detect/evcloudsvc.cpp
浏览文件 @ 9332d045
......@@ -133,7 +133,16 @@ private:
if(this->configMap["sn2mods"].count(sn) == 0) {
this->configMap["sn2mods"][sn] = json();
}
if(this->configMap["sn2mods"][sn].contains(modKey)){
// check exist
bool hasModKey =false;
for(auto &modKey_:this->configMap["sn2mods"][sn]){
if(modKey_ == modKey) {
hasModKey = true;
break;
}
}
if(hasModKey){
//nop
}else{
this->configMap["sn2mods"][sn].push_back(modKey);
......@@ -196,6 +205,7 @@ private:
if(iret >= 0) {
}
else {
spdlog::error("evcloudsvc failed to parse and save new config");
ret["code"] = iret;
ret["msg"] = "failed to save configmap";
}
......@@ -204,6 +214,16 @@ private:
this->configMap = oldConfigMap;
}
// save full config
for(auto &[k,v]: data.items()){
json j = getConfigForDevice(k);
if(j["code"] != 0) {
spdlog::error("evcloudsvc failed getConfigForDevice {}: {} ", k, j["msg"].dump());
}else{
this->peerData["fullcfg"][k] = j["data"];
}
}
ret["data"] = newConfig["data"];
}
}
......@@ -229,21 +249,23 @@ private:
if(peerData["status"].count(selfId) == 0 || peerData["status"][selfId] == 0) {
peerData["status"][selfId] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
spdlog::info("evcloudsvc {} peer connected: {}", devSn, selfId);
spdlog::info("evcloudsvc peer connected: {}", selfId);
eventConn = true;
spdlog::debug("evcloudsvc update status of {} to 1 and send config", selfId);
//
sendConfig(peerData["config"][selfId], selfId);
json data = getConfigForDevice(selfId);
if(data["code"] != 0) {
//
}else{
sendConfig(data["data"], selfId);
spdlog::info("evcloudsvc sent config to device {}:\n{}", selfId, data["data"].dump());
}
}
else {
peerData["status"][selfId] = 0;
spdlog::warn("evcloudsvc {} peer disconnected: {}", devSn, selfId);
}
if(ret < 0) {
spdlog::error("evcloudsvc {} failed to update localconfig", devSn);
}
// event
json jEvt;
jEvt["type"] = EV_MSG_TYPE_CONN_STAT;
......@@ -340,6 +362,56 @@ private:
return ret;
}
json getConfigForDevice(string sn) {
json ret;
ret["code"] = 0;
ret["msg"] = "ok";
ret["data"] = json();
json &data = ret["data"];
spdlog::info("evcloudsvc get config for sn {}", sn);
try{
if(this->configMap["sn2mods"].count(sn) != 0) {
auto mods = this->configMap["sn2mods"][sn];
set<string> s;
for(const string & elem : mods) {
s.insert(this->configMap["mod2mgr"][elem].get<string>());
spdlog::info("evcloudsvc {}->{}", elem, this->configMap["mod2mgr"][elem].get<string>());
}
for(auto &key : s) {
if(this->peerData["config"].count(key) == 0) {
spdlog::error("evcloudsvc no peerData config for device {}", key);
}else{
if(data.count(key) != 0) {
json diff = json::diff(data[key], this->peerData["config"][key]);
if(diff.size() != 0) {
string msg = "evcloudsvc inconsistent configuration for k,v, newv: " + key + ",\n" + data[key].dump() + "new v:\n" + this->peerData["config"][key].dump();
ret["code"] = 3;
ret["msg"] = msg;
break;
}
}else{
data[key] = this->peerData["config"][key];
}
}
} // for keys of mgr
ret["data"] = data;
}else{
ret["code"] = 1;
string msg = "no such sn: " + sn;
ret["msg"] = msg;
spdlog::warn("evcloudsvc no config for sn: {}", sn);
}
}catch(exception &e) {
string msg = "evcloudsvc exception in file" + string(__FILE__) + ":" + to_string(__LINE__) + " for: " + e.what();
spdlog::error(msg);
ret["code"] = -1;
ret["msg"] = msg;
}
return ret;
}
protected:
public:
void run()
......@@ -422,52 +494,7 @@ public:
}
else if(!sn.empty() && module.empty()) {
spdlog::info("evcloudsvc get config for sn {}", sn);
if(this->configMap["sn2mods"].count(sn) != 0) {
auto mods = this->configMap["sn2mods"][sn];
set<string> s;
for(const string & elem : mods) {
s.insert(this->configMap["mod2mgr"][elem].get<string>());
spdlog::info("evcloudsvc {}->{}", elem, this->configMap["mod2mgr"][elem].get<string>());
}
json data;
for(auto &key : s) {
json cfg;
int iret = LVDB::getLocalConfig(cfg, key);
if(iret < 0) {
ret["code"] = 1;
ret["msg"] = "evcloud failed to get config with key: " + key ;
spdlog::error(ret["msg"].get<string>());
}
else {
for(auto &[k,v]: cfg["data"].items()) {
if(data.count(k) != 0) {
json diff = json::diff(data[k], v);
if(diff.size() != 0) {
string msg = "evcloudsvc inconsistent configuration for k,v, newv: " + k + ",\n" + data[k].dump(4) + "new v:\n" + v.dump(4);
ret["code"] = 3;
ret["msg"] = msg;
break;
}
}
else {
data[k] = v;
}
} // for each mgr
if(ret["code"] != 0) {
break;
}
}
} // for keys of mgr
ret["data"] = data;
}else{
ret["code"] = 1;
string msg = "no such sn: " + sn;
ret["msg"] = msg;
spdlog::warn("evcloudsvc no config for sn: {}", sn);
}
ret = getConfigForDevice(sn);
}else{
ret["code"] = 2;
ret["msg"] = "invalid request. no param for sn/module";
......
opencv-motion-detect/evdaemon.cpp
浏览文件 @ 9332d045
......@@ -78,26 +78,10 @@ class EvDaemon{
this->devSn = this->info["sn"];
this->daemonId = this->devSn + ":evdaemon:0";
/// req config
json jret = cloudutils::reqConfig(this->info);
json diff = json::diff(this->config, jret["data"]);
// TODO
spdlog::info("evdaemon {} config diff: {}", devSn, diff.dump(4));
if(diff.size() == 0) {
return 0;
}
// apply config
try{
if(jret["code"] != 0) {
spdlog::error("evdaemon {} request cloud configration error: {}", this->devSn, jret["msg"].get<string>());
return 2;
}
spdlog::info("evdaemon {} got cloud config:\n{}", devSn, jret.dump(4));
json &data = jret["data"];
json &data = this->config;
string peerId;
pid_t pid;
for(auto &[k,v]:data.items()) {
......@@ -164,12 +148,10 @@ class EvDaemon{
}
}
}catch(exception &e) {
spdlog::error("evdaemon {} exception {} to reload and apply configuration:\n{}", this->devSn, e.what(), jret.dump());
spdlog::error("evdaemon {} exception {} to reload and apply configuration:\n{}", this->devSn, e.what(), this->config.dump());
return -1;
}
this->config = jret["data"];
return 0;
}
......@@ -437,10 +419,15 @@ class EvDaemon{
spdlog::error("evdaemon {} received invalid empty config");
}else{
json diff = json::diff(config, data);
json diff = json::diff(this->config, data);
// TODO: calc diff
spdlog::info("evdaemon {} received cloud config diff:\n{}\n\norigin\n{}", devSn, diff.dump(), data.dump());
bReload = true;
if(diff.size() != 0) {
bReload = true;
spdlog::info("evdaemon {} received cloud config diff. origin:\n{}\n\norigin\n{}", devSn, this->config.dump(), data.dump());
}else{
spdlog::info("evdaemon {} received same configuration and ignored: {}", data.dump());
}
}
}
}else{
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论