提交 a3633941 authored 作者: blu's avatar blu

feature: report status

上级 c57c4315
...@@ -645,7 +645,6 @@ private: ...@@ -645,7 +645,6 @@ private:
if(peerData["mod2ipc"].count(modId) == 0) { if(peerData["mod2ipc"].count(modId) == 0) {
spdlog::error("{} received report from {} modId {} having no related ipc: {}", devSn, peerId, modId, data.dump()); spdlog::error("{} received report from {} modId {} having no related ipc: {}", devSn, peerId, modId, data.dump());
}else{ }else{
spdlog::warn("{} received report msg from {}: {}", devSn, peerId, data.dump());
string ipcSn = peerData["mod2ipc"][modId]; string ipcSn = peerData["mod2ipc"][modId];
string status = data["status"]; string status = data["status"];
string catId = data["catId"]; string catId = data["catId"];
...@@ -812,6 +811,7 @@ private: ...@@ -812,6 +811,7 @@ private:
json jmeta = json::parse(meta); json jmeta = json::parse(meta);
if(jmeta["type"] == EV_MSG_META_TYPE_REPORT) { if(jmeta["type"] == EV_MSG_META_TYPE_REPORT) {
json data = json::parse(body2str(body[3])); json data = json::parse(body2str(body[3]));
spdlog::warn("{} received report msg from {}: {}", devSn, selfId, data.dump());
processReportMsg(selfId, data); processReportMsg(selfId, data);
} }
else { else {
......
...@@ -308,7 +308,7 @@ private: ...@@ -308,7 +308,7 @@ private:
int cnt = 0; int cnt = 0;
while(ret < 0) { while(ret < 0) {
if(cnt > 3) { if(cnt > 3) {
string msg = fmt::format("evpusher {} failed to write output header \"{}\": {}, {}", selfId, urlOut, ret, av_err2str(ret)); string msg = fmt::format("evpusher {} failed to write output header {}: {}, {}", selfId, urlOut, ret, av_err2str(ret));
json meta; json meta;
json data; json data;
data["msg"] = msg; data["msg"] = msg;
...@@ -389,7 +389,7 @@ private: ...@@ -389,7 +389,7 @@ private:
ret = avio_open2(&pAVFormatRemux->pb, urlOut.c_str(), AVIO_FLAG_WRITE, NULL, &pOptsRemux); ret = avio_open2(&pAVFormatRemux->pb, urlOut.c_str(), AVIO_FLAG_WRITE, NULL, &pOptsRemux);
if (ret < 0) { if (ret < 0) {
// TODO: message report to cloud // TODO: message report to cloud
string msg = fmt::format("evpusher {} failed to open output stream \"{}\": {}, {}", selfId, urlOut, ret, av_err2str(ret)); string msg = fmt::format("evpusher {} failed to open output stream {}: {}, {}", selfId, urlOut, ret, av_err2str(ret));
json meta; json meta;
json data; json data;
data["msg"] = msg; data["msg"] = msg;
...@@ -406,7 +406,7 @@ private: ...@@ -406,7 +406,7 @@ private:
exit(1); exit(1);
} }
else { else {
string msg = fmt::format("evpusher {} successfully open output \"{}\"", selfId, urlOut); string msg = fmt::format("evpusher {} successfully open output {}", selfId, urlOut);
json meta; json meta;
json data; json data;
data["msg"] = msg; data["msg"] = msg;
...@@ -426,7 +426,7 @@ private: ...@@ -426,7 +426,7 @@ private:
ret = avformat_write_header(pAVFormatRemux, &pOptsRemux); ret = avformat_write_header(pAVFormatRemux, &pOptsRemux);
if (ret < 0) { if (ret < 0) {
// TODO: report message to cloud // TODO: report message to cloud
string msg = fmt::format("evpusher {} failed to write stream \"{}\": {}, {}", selfId, urlOut, ret, av_err2str(ret)); string msg = fmt::format("evpusher {} failed to write stream {}: {}, {}", selfId, urlOut, ret, av_err2str(ret));
spdlog::error(msg); spdlog::error(msg);
} }
...@@ -434,7 +434,7 @@ private: ...@@ -434,7 +434,7 @@ private:
} }
string msg = fmt::format("evpusher {} successfully write output header \"{}\"", selfId, urlOut); string msg = fmt::format("evpusher {} successfully write output header {}", selfId, urlOut);
json meta; json meta;
json data; json data;
data["msg"] = msg; data["msg"] = msg;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论