提交 167bcb90 authored 作者: blu's avatar blu

feature: multiple cameras clusters on one box

上级 f0b85e5e
...@@ -100,6 +100,7 @@ private: ...@@ -100,6 +100,7 @@ private:
msg +=body2str(b) + ";"; msg +=body2str(b) + ";";
} }
// msg = msg.substr(0, msg.size()> 100? 15:msg.size());
bool bProcessed = false; bool bProcessed = false;
if(v.size() == 3) { if(v.size() == 3) {
try { try {
...@@ -141,6 +142,8 @@ private: ...@@ -141,6 +142,8 @@ private:
msg +=body2str(b) + ";"; msg +=body2str(b) + ";";
} }
msg = msg.substr(0, msg.size()> EV_MSG_DEBUG_LEN? EV_MSG_DEBUG_LEN:msg.size());
bool bProcessed = false; bool bProcessed = false;
if(v.size() == 3) { if(v.size() == 3) {
try { try {
...@@ -774,10 +777,6 @@ protected: ...@@ -774,10 +777,6 @@ protected:
bStopSig = true; bStopSig = true;
break; break;
} }
// if(1 == getppid()) {
// spdlog::error("evmlmotion {} exit since evdaemon is dead", selfId);
// exit(1);
// }
// business logic // business logic
int ret =zmq_msg_init(&msg); int ret =zmq_msg_init(&msg);
......
...@@ -129,7 +129,7 @@ private: ...@@ -129,7 +129,7 @@ private:
string sMeta = body2str(v[1]); string sMeta = body2str(v[1]);
string peerId = body2str(v[0]); string peerId = body2str(v[0]);
auto meta = json::parse(sMeta); auto meta = json::parse(sMeta);
if(meta["type"].get<string>() == EV_MSG_META_AVFORMATCTX) { if(meta["type"].get<string>() == EV_MSG_META_AVFORMATCTX && body2str(v[2]) == MSG_HELLO) {
sendAVInputCtxMsg(peerId); sendAVInputCtxMsg(peerId);
} }
else if(meta["type"].get<string>() == EV_MSG_META_EVENT) { else if(meta["type"].get<string>() == EV_MSG_META_EVENT) {
...@@ -477,6 +477,8 @@ public: ...@@ -477,6 +477,8 @@ public:
for(auto &v: body) { for(auto &v: body) {
msg += body2str(v) + ","; msg += body2str(v) + ",";
} }
msg = msg.substr(0, msg.size()> EV_MSG_DEBUG_LEN? EV_MSG_DEBUG_LEN:msg.size());
spdlog::info("evpuller {} received edge msg: {}", selfId, msg); spdlog::info("evpuller {} received edge msg: {}", selfId, msg);
this->handleEdgeMsg(body); this->handleEdgeMsg(body);
} }
......
...@@ -239,6 +239,8 @@ private: ...@@ -239,6 +239,8 @@ private:
msg +=body2str(b) + ";"; msg +=body2str(b) + ";";
} }
msg = msg.substr(0, msg.size()> EV_MSG_DEBUG_LEN? EV_MSG_DEBUG_LEN:msg.size());
bool bProcessed = false; bool bProcessed = false;
if(v.size() == 3) { if(v.size() == 3) {
try { try {
......
...@@ -86,6 +86,7 @@ private: ...@@ -86,6 +86,7 @@ private:
msg +=body2str(b) + ";"; msg +=body2str(b) + ";";
} }
msg = msg.substr(0, msg.size()> EV_MSG_DEBUG_LEN? EV_MSG_DEBUG_LEN:msg.size());
if(v.size() == 3) { if(v.size() == 3) {
try { try {
peerId = body2str(v[0]); peerId = body2str(v[0]);
......
...@@ -22,6 +22,7 @@ using namespace std; ...@@ -22,6 +22,7 @@ using namespace std;
using namespace nlohmann; using namespace nlohmann;
namespace zmqhelper { namespace zmqhelper {
#define EV_MSG_DEBUG_LEN 128
#define EV_HEARTBEAT_SECONDS 30 #define EV_HEARTBEAT_SECONDS 30
#define MSG_HELLO "hello" #define MSG_HELLO "hello"
#define EV_MSG_META_PING "ping" #define EV_MSG_META_PING "ping"
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论