dingbot

opencv-motion-detect/dingbot/notify.py

@@ -12,6 +12,7 @@ from models import Terminal
 import paho.mqtt.client as mqtt
 import logging
 import pdb, traceback, sys, socket
+import time
 
 logger = logging.getLogger(__file__)
 logger.setLevel(logging.INFO)
@@ -81,6 +82,7 @@ class DingBot:
             try:
                 jd = json.loads(payload)
                 userdata.handle(jd)
+                time.sleep(1);
             except Exception as e:
                 logger.error('exception in process message: {}'.format(e))
                 #extype, value, tb = sys.exc_info()

opencv-motion-detect/evcloudsvc.cpp

@@ -1482,9 +1482,15 @@ public:
                 if(!sn.empty() && sn != "all") {
                     lock_guard<recursive_mutex> lg(mutIpcStatus);
                     if(this->peerData["ipcStatus"].count(sn) != 0) {
-                        json j;
-                        j[sn] = this->peerData["ipcStatus"][sn];
-                        detail = j;
+                        auto ipcStatus = this->peerData["ipcStatus"][sn];
+                        auto r = buildIssuesForIpc(sn, ipcStatus);
+                        if(r.size() > 0){
+                            detail["issues"] = r;
+                        }
+                        detail["current"]= ipcStatus["current"];
+                        detail["expected"] = ipcStatus["expected"];
+                        detail["lastNReports"] = ipcStatus["lastNReports"];
+                        detail["mgrTerminal"] = ipcStatus["mgrTerminal"];
                     }
                     else {
                         ret["msg"] = "ipc not found";