big refacting of communitation architect

opencv-motion-detect/evdaemon.cpp

@@ -165,7 +165,8 @@ class EvDaemon{
     void setupSubSystems() {
         thMon = thread([this](){
             while(true) {
-                if(bReload) {
+                if(this->bReload) {
+                    cleanupSubSystems();
                     int ret = reloadCfg();
                     if(ret != 0) {
                         cleanupSubSystems();
@@ -181,6 +182,46 @@ class EvDaemon{
         thMon.detach();
     }
 
+    int startSubModule(string peerId){
+        int ret = 0;
+        if(peerData["status"].count(peerId) == 0 || peerData["status"][peerId] == 0) {
+            //
+        }else if(peerData["pids"].count(peerId) != 0){
+            kill(peerData["pids"][peerId], SIGTERM);
+            peerData["pids"].erase(peerId);
+            peerData["status"][peerId] = 0;
+        }
+        json jret = cloudutils::reqConfig(this->info);
+        // apply config
+        try{
+            if(jret["code"] != 0) {
+                spdlog::error("evdaemon {} request cloud configration error: {}", this->devSn, jret["msg"].get<string>());
+                return 2;
+            }
+            json *cfg = cfgutils::findModuleConfig(peerId, jret["data"]);
+            if(cfg == NULL) {
+                spdlog::error("evdaemon failed to find module {} in config {}", peerId, jret["data"].dump());
+                return 1;
+            }
+            peerData["config"][peerId] = *cfg;
+            peerData["status"][peerId] = 0;
+            pid_t pid;
+            ret = zmqhelper::forkSubsystem(devSn, peerId, portRouter, pid);
+            if(ret != 0) {
+                spdlog::error("evdaemon {} failed to fork subsystem: {}", devSn, peerId);
+                // TODO: clean up and reload config
+                return -3;
+            }
+            this->peerData["pids"][peerId] = pid;
+        }catch(exception &e) {
+            spdlog::error("evdaemon {} exception : {}", devSn, e.what());
+            return -1;
+        }
+
+        return 0;
+        
+    }
+
 
     int handleMsg(vector<vector<uint8_t> > &body)
     {
@@ -217,7 +258,11 @@ class EvDaemon{
             }
             else {
                 peerData["status"][selfId] = 0;
+                peerData["pids"].erase(selfId);
+                peerData["config"].erase(selfId);
                 spdlog::warn("evdaemon {} peer disconnected: {}", devSn, selfId);
+                // restart this module
+                startSubModule(selfId);
             }
 
             if(ret < 0) {
@@ -377,6 +422,14 @@ class EvDaemon{
             res.set_content(ret.dump(), "text/json");
         });
 
+        svr.Get("/sync-cloud", [this](const Request& req, Response& res){
+            json ret;
+            ret["code"] = 0;
+            ret["msg"] = "syncing ...";
+            res.set_content(ret.dump(), "text/json");
+            this->bReload = true;
+        });
+
         svr.Get("/reset", [](const Request& req, Response& res){
             json ret;
             ret["code"] = 0;

opencv-motion-detect/evmlmotion.cpp

@@ -93,7 +93,7 @@ private:
         // TODO: req config
         bool found = false;
         try {
-            spdlog::info("evmlmotion {} config: {}", devSn, config.dump(4));
+            spdlog::info("evmlmotion {} config: {}", devSn, config.dump());
             json evmlmotion;
             json &evmgr = this->config;
             json ipc;
@@ -585,6 +585,10 @@ protected:
                 bStopSig = true;
                 break;
             }
+            if(1 == getppid()) {
+                spdlog::error("evmlmotion {} exit since evdaemon is dead", selfId);
+                exit(1);
+            }
 
             // business logic
             int ret =zmq_msg_init(&msg);

opencv-motion-detect/evpuller.cpp

@@ -305,6 +305,12 @@ protected:
                 bStopSig = true;
                 break;
             }
+
+            if(1 == getppid()) {
+                spdlog::error("evpuller {} exit since evdaemon is dead", selfId);
+                exit(1);
+            }
+
             AVStream *in_stream;
             AVPacket packet;
             zmq_msg_t msg;

opencv-motion-detect/evpusher.cpp

@@ -320,6 +320,12 @@ protected:
                 bStopSig = true;
                 break;
             }
+
+            if(1 == getppid()) {
+                spdlog::error("evpusher {} exit since evdaemon is dead", selfId);
+                exit(1);
+            }
+
             ret =zmq_msg_init(&msg);
             if(ret != 0) {
                 spdlog::error("failed to init zmq msg");

opencv-motion-detect/evslicer.cpp

@@ -361,6 +361,12 @@ protected:
                     bStopSig = true;
                     break;
                 }
+
+                if(1 == getppid()) {
+                    spdlog::error("evmgr {} exit since evdaemon is dead", selfId);
+                    exit(1);
+                }
+
                 // business logic
                 int ret =zmq_msg_init(&msg);
                 ret = zmq_recvmsg(pSub, &msg, 0);

opencv-motion-detect/inc/utils.hpp

@@ -143,7 +143,63 @@ namespace cfgutils {
 
       return 0;
    }
-}
+
+
+   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 = "";
+      }
+
+      for(auto &[k,v]: data.items()) {
+         // it's evmgr
+         if(modName == "evmgr") {
+            if(k == sn) {
+               ret = &v;
+               break;
+            }
+         }else{
+            json &ipcs = v["ipcs"];
+            
+            for(auto &ipc: ipcs) {
+               json &modules = ipc["modules"];
+               for(auto &[mn, ml]: modules.items()) {
+                  for(auto &m: ml) {
+                     if(subMn.empty()){
+                        if(mn == modName && m["sn"] == sn && m["iid"] == iid && m["enabled"] != 0) {
+                           ret = &v;
+                           break;
+                        }
+                     }else{
+                        if(subMn == m["type"] && m[iid] == iid && m["sn"] == sn && m["enabled"] != 0) {
+                           ret = &v;
+                           break;
+                        }
+                     }
+                  }
+                  if(ret != NULL) break;
+               }
+               if(ret != NULL) break;
+            }
+         }
+      }
+
+      return ret;
+   }
+} // cfgutils
 
 
 struct StrException : public std::exception