big refacting of communitation architect

opencv-motion-detect/evdaemon.cpp

@@ -65,6 +65,9 @@ class EvDaemon{
         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));
         // apply config
         try{
             if(jret["code"] != 0) {
@@ -142,6 +145,8 @@ class EvDaemon{
             return -1;
         }
 
+        this->config = jret["data"];
+
         return 0;
     }
 
@@ -203,6 +208,10 @@ class EvDaemon{
                 spdlog::error("evdaemon failed to find module {} in config {}", peerId, jret["data"].dump());
                 return 1;
             }
+            json diff = json::diff(this->config, jret["data"]);
+            // TODO:
+            spdlog::info("evdaemon {} config diff: {}", devSn, diff.dump(4));
+
             peerData["config"][peerId] = *cfg;
             peerData["status"][peerId] = 0;
             pid_t pid;

opencv-motion-detect/inc/utils.hpp

@@ -164,37 +164,42 @@ namespace cfgutils {
          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;
+      try{
+         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(mn == "evml" && !subMn.empty()){
+                           if(subMn == m["type"] && m[iid] == iid && m["sn"] == sn && m["enabled"] != 0) {
+                              ret = &v;
+                              break;
+                           }
+                        }else if(subMn.empty()){
+                           if(mn == modName && m["sn"] == sn && m["iid"] == iid && m["enabled"] != 0) {
+                              ret = &v;
+                              break;
+                           }
                         }
                      }
+                     if(ret != NULL) break;
                   }
                   if(ret != NULL) break;
                }
-               if(ret != NULL) break;
             }
          }
+      }catch(exception &e) {
+         spdlog::error("find module {} in {} exception: {}", peerId, data.dump(), e.what());
+         return NULL;
       }
 
       return ret;