upload video files

opencv-motion-detect/config.json

 {
    "data":{
-      "OLL91IZQ":{
+      "PSBV7GKN":{
          "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":"OLL91IZQ",
+                        "sn":"PSBV7GKN",
                         "thresh":80,
                         "type":"motion"
                      }
@@ -25,7 +25,7 @@
                         "iid":1,
                         "enabled": 1,
                         "port-pub":5556,
-                        "sn":"OLL91IZQ"
+                        "sn":"PSBV7GKN"
                      }
                   ],
                   "evpusher":[
@@ -33,9 +33,9 @@
                         "enabled":1,
                         "iid":1,
                         "password":"",
-                        "sn":"OLL91IZQ",
+                        "sn":"PSBV7GKN",
                         "token":"",
-                        "urlDest":"rtsp://40.73.41.176:554/test1",
+                        "urlDest":"rtsp://40.73.41.176:554/PSBV7GKN",
                         "user":""
                      }
                   ],
@@ -44,7 +44,7 @@
                         "enabled":1,
                         "iid":1,
                         "path":"slices",
-                        "sn":"OLL91IZQ"
+                        "sn":"PSBV7GKN"
                      }
                   ]
                },
@@ -52,14 +52,14 @@
                "port":554,
                "proto":"rtsp",
                "user":"admin",
-               "sn": "SN_CAMERA"
+               "sn": "PSBV7GKN"
             }
          ],
          "mqtt-cloud":"<cloud_addr>",
          "port-cloud":5556,
          "port-router":5550,
          "proto":"zmq",
-         "sn":"OLL91IZQ"
+         "sn":"PSBV7GKN"
       }
    },
    "lastupdated":1567669674

opencv-motion-detect/evcloudsvc.cpp

@@ -75,7 +75,7 @@ private:
         ret["code"] = 0;
         ret["msg"] = "ok";
         ret["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
-        spdlog::info(newConfig.dump());
+        spdlog::info("evcloudsvc POST config:{}",newConfig.dump());
         try {
             json deltaCfg = json();
             if(newConfig.count("data") == 0 || newConfig["data"].size() == 0) {
@@ -188,6 +188,7 @@ private:
                     // update in memory peerData
                     if(this->peerData["config"].count(k) != 0) {
                         json diff = json::diff(this->peerData["config"][k], v);
+                        
                         if(diff.size()!=0) {
                             // send config
                             deltaCfg[k] = 1;
@@ -198,7 +199,10 @@ private:
                         }
                     }else{
                         this->peerData["config"][k] = v;
-                    } 
+                    }
+                    // TODO: important! always send config in case edge config is corrupted.
+                    deltaCfg[k] = 1;
+
                     // TODO: trigger msg
                 } // for evmgr
 
@@ -242,7 +246,7 @@ private:
     bool handleConnection(string selfId) {
         bool ret = false;
         int state = zmq_socket_get_peer_state(pRouter, selfId.data(), selfId.size());
-        spdlog::info("{} state: {}", selfId, state);
+        spdlog::info("evcloudsvc peer {} state: {}", selfId, state);
         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: {}", selfId);