提交 42aea38a authored 作者: blu's avatar blu

feature: report status

上级 f27c7b20
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"pre":4, "pre":4,
"sn":"V2I0C7KC", "sn":"V2I0C7KC",
"thresh":30, "thresh":30,
"fpsProc": 3,
"entropy": 0.3, "entropy": 0.3,
"type":"motion" "type":"motion"
} }
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
}, },
"issues": { "issues": {
"MODID": { "MODID": {
"runTerminalOnline": true,
"REPORT_CATID": { "REPORT_CATID": {
"status": "active" "status": "active"
} }
......
...@@ -87,6 +87,7 @@ private: ...@@ -87,6 +87,7 @@ private:
bool inited = false; bool inited = false;
int opt_notify = ZMQ_NOTIFY_DISCONNECT|ZMQ_NOTIFY_CONNECT; int opt_notify = ZMQ_NOTIFY_DISCONNECT|ZMQ_NOTIFY_CONNECT;
string addr; string addr;
string portRouter;
try { try {
// //
...@@ -102,7 +103,13 @@ private: ...@@ -102,7 +103,13 @@ private:
goto error_exit; goto error_exit;
} }
addr = "tcp://*:" + to_string(config["portRouter"]); if(config.count("portRouter") != 0) {
portRouter = to_string(config["portRouter"]);
}else if(config.count("port-router") != 0) {
portRouter = to_string(config["port-router"]);
}
addr = "tcp://*:" + portRouter;
// setup zmq // setup zmq
// router service // router service
pRouterCtx = zmq_ctx_new(); pRouterCtx = zmq_ctx_new();
......
...@@ -829,11 +829,11 @@ protected: ...@@ -829,11 +829,11 @@ protected:
data["modId"] = selfId; data["modId"] = selfId;
data["type"] = EV_MSG_META_TYPE_REPORT; data["type"] = EV_MSG_META_TYPE_REPORT;
data["catId"] = EV_MSG_REPORT_CATID_AVWRITEPIPE; data["catId"] = EV_MSG_REPORT_CATID_AVWRITEPIPE;
data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
data["status"] = "recover"; data["status"] = "recover";
meta["type"] = EV_MSG_META_TYPE_REPORT; meta["type"] = EV_MSG_META_TYPE_REPORT;
meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump()); z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
spdlog::info(msg); spdlog::info(msg);
} }
......
...@@ -336,11 +336,11 @@ protected: ...@@ -336,11 +336,11 @@ protected:
data["modId"] = selfId; data["modId"] = selfId;
data["type"] = EV_MSG_META_TYPE_REPORT; data["type"] = EV_MSG_META_TYPE_REPORT;
data["catId"] = EV_MSG_REPORT_CATID_AVOPENINPUT; data["catId"] = EV_MSG_REPORT_CATID_AVOPENINPUT;
data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
data["status"] = "recover"; data["status"] = "recover";
meta["type"] = EV_MSG_META_TYPE_REPORT; meta["type"] = EV_MSG_META_TYPE_REPORT;
meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump()); z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
spdlog::info(msg); spdlog::info(msg);
} }
......
...@@ -413,11 +413,11 @@ private: ...@@ -413,11 +413,11 @@ private:
data["modId"] = selfId; data["modId"] = selfId;
data["type"] = EV_MSG_META_TYPE_REPORT; data["type"] = EV_MSG_META_TYPE_REPORT;
data["catId"] = EV_MSG_REPORT_CATID_AVOPENOUTPUT; data["catId"] = EV_MSG_REPORT_CATID_AVOPENOUTPUT;
data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
data["status"] = "recover"; data["status"] = "recover";
meta["type"] = EV_MSG_META_TYPE_REPORT; meta["type"] = EV_MSG_META_TYPE_REPORT;
meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump()); z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
spdlog::info(msg); spdlog::info(msg);
} }
...@@ -441,11 +441,11 @@ private: ...@@ -441,11 +441,11 @@ private:
data["modId"] = selfId; data["modId"] = selfId;
data["type"] = EV_MSG_META_TYPE_REPORT; data["type"] = EV_MSG_META_TYPE_REPORT;
data["catId"] = EV_MSG_REPORT_CATID_AVWRITEHEADER; data["catId"] = EV_MSG_REPORT_CATID_AVWRITEHEADER;
data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
data["status"] = "recover"; data["status"] = "recover";
meta["type"] = EV_MSG_META_TYPE_REPORT; meta["type"] = EV_MSG_META_TYPE_REPORT;
meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump()); z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
return ret; return ret;
...@@ -568,7 +568,7 @@ protected: ...@@ -568,7 +568,7 @@ protected:
data["modId"] = selfId; data["modId"] = selfId;
data["type"] = EV_MSG_META_TYPE_REPORT; data["type"] = EV_MSG_META_TYPE_REPORT;
data["catId"] = EV_MSG_REPORT_CATID_AVWRITEPIPE; data["catId"] = EV_MSG_REPORT_CATID_AVWRITEPIPE;
data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
data["status"] = "recover"; data["status"] = "recover";
meta["type"] = EV_MSG_META_TYPE_REPORT; meta["type"] = EV_MSG_META_TYPE_REPORT;
......
...@@ -624,11 +624,11 @@ protected: ...@@ -624,11 +624,11 @@ protected:
data["modId"] = selfId; data["modId"] = selfId;
data["type"] = EV_MSG_META_TYPE_REPORT; data["type"] = EV_MSG_META_TYPE_REPORT;
data["catId"] = EV_MSG_REPORT_CATID_AVWRITEPIPE; data["catId"] = EV_MSG_REPORT_CATID_AVWRITEPIPE;
data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); data["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
data["status"] = "recover"; data["status"] = "recover";
meta["type"] = EV_MSG_META_TYPE_REPORT; meta["type"] = EV_MSG_META_TYPE_REPORT;
meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO; meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump()); z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论