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

evdameon, evcloudsvc: subsystem monitor thread and defered uploading

上级 61740a7f
...@@ -454,14 +454,22 @@ private: ...@@ -454,14 +454,22 @@ private:
int sendCmd2Peer(string peerId, string cmdVal, string msg) int sendCmd2Peer(string peerId, string cmdVal, string msg)
{ {
json meta; json meta;
int ret = 0;
meta["type"] = EV_MSG_META_TYPE_CMD; meta["type"] = EV_MSG_META_TYPE_CMD;
meta["value"] = cmdVal; meta["value"] = cmdVal;
int ret = z_send(pRouter, peerId, this->daemonId, meta, msg); if(msg == "0"){
if(ret < 0) { auto sp = strutils::split(peerId, ':');
spdlog::error("evdaemon {} failed to send msg to peer {}: {} - {}", devSn, peerId, meta.dump(), msg); if(sp.size() == 3){
} system((string("pkill -9 ") + sp[1]).c_str());
else { }
spdlog::info("evdaemon {} successfully send msg to peer {}: {} - {}", devSn, peerId, meta.dump(), msg); }else{
ret = z_send(pRouter, peerId, this->daemonId, meta, msg);
if(ret < 0) {
spdlog::error("evdaemon {} failed to send msg to peer {}: {} - {}", devSn, peerId, meta.dump(), msg);
}
else {
spdlog::info("evdaemon {} successfully send msg to peer {}: {} - {}", devSn, peerId, meta.dump(), msg);
}
} }
return ret; return ret;
} }
......
...@@ -207,7 +207,7 @@ int forkSubsystem(string devSn, string peerId, int drPort, pid_t &pid){ ...@@ -207,7 +207,7 @@ int forkSubsystem(string devSn, string peerId, int drPort, pid_t &pid){
auto v = strutils::split(peerId, ':'); auto v = strutils::split(peerId, ':');
string modName = v[1]; string modName = v[1];
string sn = v[0]; string sn = v[0];
system(string("killall " + modName).c_str()); system(string("pkill -9 " + modName).c_str());
if( (pid = fork()) == -1 ) { if( (pid = fork()) == -1 ) {
spdlog::error("evdamon {} failed to fork subsytem: {}", devSn, peerId); spdlog::error("evdamon {} failed to fork subsytem: {}", devSn, peerId);
return -1; return -1;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论