提交 9ddb18eb authored 作者: blu's avatar blu

big refacting of communitation architect

上级 4b48f51f
...@@ -335,7 +335,6 @@ private: ...@@ -335,7 +335,6 @@ private:
} }
} }
} }
catch(exception &e) { catch(exception &e) {
spdlog::error("evcloudsvc {} exception parse event msg from {} to {}: ", devSn, selfId, peerId, e.what()); spdlog::error("evcloudsvc {} exception parse event msg from {} to {}: ", devSn, selfId, peerId, e.what());
} }
...@@ -409,7 +408,6 @@ private: ...@@ -409,7 +408,6 @@ private:
string msg = "no such sn: " + sn; string msg = "no such sn: " + sn;
ret["msg"] = msg; ret["msg"] = msg;
spdlog::warn("evcloudsvc no config for sn: {}", sn); spdlog::warn("evcloudsvc no config for sn: {}", sn);
// TODO: append to retry queue
} }
}catch(exception &e) { }catch(exception &e) {
string msg = "evcloudsvc exception in file" + string(__FILE__) + ":" + to_string(__LINE__) + " for: " + e.what(); string msg = "evcloudsvc exception in file" + string(__FILE__) + ":" + to_string(__LINE__) + " for: " + e.what();
......
...@@ -134,13 +134,15 @@ private: ...@@ -134,13 +134,15 @@ private:
json evpuller = ipc["modules"]["evpuller"][0]; json evpuller = ipc["modules"]["evpuller"][0];
pullerGid = evpuller["sn"].get<string>() + ":evpuller:" + to_string(evpuller["iid"]); pullerGid = evpuller["sn"].get<string>() + ":evpuller:" + to_string(evpuller["iid"]);
mgrSn = evmgr["sn"]; mgrSn = evmgr["sn"];
if(evslicer.count("path") == 0) {
if(evslicer.count("path") == 0){
spdlog::info("evslicer {} no params for path, using default: {}", selfId, URLOUT_DEFAULT); spdlog::info("evslicer {} no params for path, using default: {}", selfId, URLOUT_DEFAULT);
urlOut = URLOUT_DEFAULT; urlOut = URLOUT_DEFAULT;
} }
else { else {
urlOut = evslicer["path"]; urlOut = evslicer["path"];
} }
if(evslicer.count("days") == 0) { if(evslicer.count("days") == 0) {
spdlog::info("evslicer {} no params for days, using default: {}", selfId, NUM_DAYS_DEFAULT); spdlog::info("evslicer {} no params for days, using default: {}", selfId, NUM_DAYS_DEFAULT);
days = NUM_DAYS_DEFAULT; days = NUM_DAYS_DEFAULT;
...@@ -587,14 +589,12 @@ public: ...@@ -587,14 +589,12 @@ public:
this->segHead = 0; this->segHead = 0;
this->segTail = vTsActive.size(); this->segTail = vTsActive.size();
monitor * m = nullptr; monitor * m = nullptr;
// auto fn = (FSW_EVENT_CALLBACK)bind(&EvSlicer::fileMonHandler, this, placeholders::_1, placeholders::_2);
CreateDirMon(&m, this->urlOut, ".mp4", vector<string>(), EvSlicer::fileMonHandler, (void *)this); CreateDirMon(&m, this->urlOut, ".mp4", vector<string>(), EvSlicer::fileMonHandler, (void *)this);
}); });
thSliceMgr.detach(); thSliceMgr.detach();
// thread for uploading slices // thread for uploading slices
getInputFormat(); getInputFormat();
setupStream(); setupStream();
}; };
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论