提交 51af8237 authored 作者: blu's avatar blu

big refacting of communitation architect

上级 53d355cd
...@@ -141,21 +141,21 @@ private: ...@@ -141,21 +141,21 @@ private:
} }
// event // event
json jEvt; // json jEvt;
jEvt["type"] = EV_MSG_TYPE_CONN_STAT; // jEvt["type"] = EV_MSG_TYPE_CONN_STAT;
jEvt["gid"] = selfId; // jEvt["gid"] = selfId;
jEvt["ts"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); // jEvt["ts"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
if(eventConn) { // if(eventConn) {
jEvt["event"] = EV_MSG_EVENT_CONN_CONN; // jEvt["event"] = EV_MSG_EVENT_CONN_CONN;
} // }
else { // else {
jEvt["event"] = EV_MSG_EVENT_CONN_DISCONN; // jEvt["event"] = EV_MSG_EVENT_CONN_DISCONN;
} // }
eventQue.push(jEvt.dump()); // eventQue.push(jEvt.dump());
if(eventQue.size() > MAX_EVENT_QUEUE_SIZE) { // if(eventQue.size() > MAX_EVENT_QUEUE_SIZE) {
eventQue.pop(); // eventQue.pop();
} // }
return 0; return 0;
} }
......
...@@ -83,8 +83,11 @@ private: ...@@ -83,8 +83,11 @@ private:
gotFormat = true; gotFormat = true;
spdlog::info("evslicer {} got avformat from {}", selfId, peerId); spdlog::info("evslicer {} got avformat from {}", selfId, peerId);
} }
else { else if(meta == EV_MSG_META_EVENT){
data = json::parse(body2str(v[2]));
spdlog::info("evslicer {} received msg from {}, type = {}, data = {}", selfId, peerId, meta, data.dump()); spdlog::info("evslicer {} received msg from {}, type = {}, data = {}", selfId, peerId, meta, data.dump());
}else{
spdlog::info("evslicer {} received unkown msg from {}: {}", selfId, peerId, msg);
} }
} }
catch(exception &e) { catch(exception &e) {
...@@ -587,9 +590,6 @@ protected: ...@@ -587,9 +590,6 @@ protected:
auto ts = self->videoFileName2Ts(baseName); auto ts = self->videoFileName2Ts(baseName);
auto oldTs = self->vTsActive[self->segHead]; auto oldTs = self->vTsActive[self->segHead];
self->vTsActive[self->segHead] = ts; self->vTsActive[self->segHead] = ts;
//self->mapTs2BaseName[ts] = baseName;
// erase old ts to save memory
//self->mapTs2BaseName.erase(oldTs);
self->segHead++; self->segHead++;
spdlog::info("evslicer {} fileMonHandler video seg done: {}/{}.mp4, ts:{}", self->selfId, self->urlOut, baseName, ts); spdlog::info("evslicer {} fileMonHandler video seg done: {}/{}.mp4, ts:{}", self->selfId, self->urlOut, baseName, ts);
}catch(exception &e) { }catch(exception &e) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论