refactor of delta config

opencv-motion-detect/Makefile

@@ -83,7 +83,7 @@ evdaemon: evdaemon.cpp inc/common.hpp objs/utils.o objs/database.o objs/zmqhelpe
 	$(CPP) $(CPPFLAGS) $(LD_FLAGS) -o evdaemon evdaemon.cpp objs/database.o objs/utils.o objs/zmqhelper.o $(SQLITE) $(HEADERS) `pkg-config --cflags --libs vendor/lib/pkgconfig/libzmq.pc` $(LIBS)
 
 evcloudsvc: evcloudsvc.cpp objs/utils.o objs/database.o objs/zmqhelper.o  inc/tinythread.hpp
-	$(CPP) $(CPPFLAGS) $(LD_FLAGS) -o evcloudsvc evcloudsvc.cpp objs/utils.o objs/database.o objs/zmqhelper.o $(SQLITE) $(HEADERS) `pkg-config --cflags --libs vendor/lib/pkgconfig/libzmq.pc` $(LIBS)
+	$(CPP) $(CPPFLAGS) $(LD_FLAGS) -o evcloudsvc evcloudsvc.cpp objs/utils.o objs/database.o objs/zmqhelper.o $(SQLITE) $(HEADERS) `pkg-config --cflags --libs vendor/lib/pkgconfig/libzmq.pc` $(LIBS) -lfmt
 
 rtspr: rtsp-relay.cpp
 	$(CPP) $(CPPFLAGS) $(LD_FLAGS) -o rtspr rtsp-relay.cpp $(LIBFFMPEG) $(LD_FLAGS)

opencv-motion-detect/evcloudsvc.cpp

@@ -18,6 +18,7 @@ update: 2019/09/10
 #include "inc/spdlog/spdlog.h"
 #include "utils.hpp"
 #include "inc/zmqhelper.hpp"
+#include "fmt/format.h"
 
 using namespace std;
 using namespace httplib;
@@ -114,10 +115,11 @@ private:
         spdlog::info("evcloudsvc POST config:{}",newConfig.dump());
         try {
             json deltaCfg = json();
-            if(newConfig.count("data") == 0 || newConfig["data"].size() == 0) {
+            if(newConfig.count("data") == 0|| newConfig["dsata"].size() == 0) {
+                string msg = fmt::format("evcloudsvc invalid configuratin body received - empty or no data field: {}", newConfig.dump());
                 ret["code"] = 1;
-                ret["msg"] = "evcloudsvc invalid config body received: " + newConfig.dump();
-                spdlog::error(ret["msg"].get<string>());
+                ret["msg"] = msg;
+                spdlog::error(msg);
             }
             else {
                 json &data = newConfig["data"];
@@ -131,8 +133,9 @@ private:
                     // this is one evmgr
                     if(v.count("sn") == 0||v["sn"] != k) {
                         ret["code"] = 2;
-                        ret["msg"] = "evcloudsvc invalid value for key " + k;
-                        spdlog::error(ret["msg"].get<string>());
+                        string msg = fmt::format("evcloudsvc invalid value for cluster mgr with sn {} but key: {}", k, string(v["sn"]));
+                        ret["msg"] = msg;
+                        spdlog::error(msg);
                         break;
                     }
                     else {

opencv-motion-detect/evslicer.cpp

@@ -612,6 +612,7 @@ protected:
 
                 baseName = getBaseName(fname);
                 auto ts = videoFileName2Ts(baseName);
+                spdlog::info("evslicer {} LoadVideoFiles basename: {}, ts: {}", selfId, baseName, ts);
 
                 // check old files
                 if(ts - now > hours * 60 * 60) {