提交 4c2aab6c authored 作者: blu's avatar blu

bugfix status issue of subsystems

上级 05a1694e
FROM jrottenberg/ffmpeg:4.1-alpine FROM jrottenberg/ffmpeg:4.1-alpine
RUN apk update && apk --no-cache add tini RUN apk update && apk --no-cache add tini curl
COPY run.sh /bin/run.sh COPY run.sh /bin/run.sh
RUN chmod +x /bin/run.sh RUN chmod +x /bin/run.sh
STOPSIGNAL SIGINT STOPSIGNAL SIGINT
......
...@@ -297,9 +297,9 @@ private: ...@@ -297,9 +297,9 @@ private:
z_send(pDealer, "evcloudsvc", meta.dump(), data.dump()); z_send(pDealer, "evcloudsvc", meta.dump(), data.dump());
this_thread::sleep_for(chrono::seconds(10)); this_thread::sleep_for(chrono::seconds(10));
} }
this->peerData["status"][k] = 0;
ret = zmqhelper::forkSubsystem(devSn, k, portRouter, pid); ret = zmqhelper::forkSubsystem(devSn, k, portRouter, pid);
if(0 == ret) { if(0 == ret) {
this->peerData["status"][k] = 0;
this->peerData["pids"][k] = pid; this->peerData["pids"][k] = pid;
spdlog::info("evdaemon {} created subsystem {} (current status: {})", this->devSn, k, this->peerData["status"][k].get<int>()); spdlog::info("evdaemon {} created subsystem {} (current status: {})", this->devSn, k, this->peerData["status"][k].get<int>());
} }
...@@ -339,9 +339,9 @@ private: ...@@ -339,9 +339,9 @@ private:
// //
for(string &e : tmp) { for(string &e : tmp) {
pid_t pid = 0; pid_t pid = 0;
this->peerData["status"][e] = 0;
ret = zmqhelper::forkSubsystem(devSn, e, portRouter, pid); ret = zmqhelper::forkSubsystem(devSn, e, portRouter, pid);
if(0 == ret) { if(0 == ret) {
this->peerData["status"][e] = 0;
this->peerData["pids"][e] = pid; this->peerData["pids"][e] = pid;
spdlog::info("evdaemon {} created subsystem {}", devSn, e); spdlog::info("evdaemon {} created subsystem {}", devSn, e);
} }
...@@ -369,9 +369,9 @@ private: ...@@ -369,9 +369,9 @@ private:
for(auto &[k,v]: unkown.items()) { for(auto &[k,v]: unkown.items()) {
pid_t pid = 0; pid_t pid = 0;
this->peerData["status"][k] = 0;
ret = zmqhelper::forkSubsystem(devSn, k, portRouter, pid); ret = zmqhelper::forkSubsystem(devSn, k, portRouter, pid);
if(0 == ret) { if(0 == ret) {
this->peerData["status"][k] = 0;
this->peerData["pids"][k] = pid; this->peerData["pids"][k] = pid;
spdlog::info("evdaemon {} created subsystem {}", devSn, k); spdlog::info("evdaemon {} created subsystem {}", devSn, k);
} }
...@@ -422,9 +422,9 @@ private: ...@@ -422,9 +422,9 @@ private:
if(this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0||this->peerData["status"][k] == -1||this->peerData["status"][k]== 1||this->peerData["status"][k] == 2) { if(this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0||this->peerData["status"][k] == -1||this->peerData["status"][k]== 1||this->peerData["status"][k] == 2) {
pid_t pid; pid_t pid;
spdlog::info("evdaemon {} starting subsystem {}", this->devSn, k); spdlog::info("evdaemon {} starting subsystem {}", this->devSn, k);
this->peerData["status"][k] = 0;
ret = zmqhelper::forkSubsystem(devSn, k, portRouter, pid); ret = zmqhelper::forkSubsystem(devSn, k, portRouter, pid);
if(0 == ret) { if(0 == ret) {
this->peerData["status"][k] = 0;
this->peerData["pids"][k] = pid; this->peerData["pids"][k] = pid;
spdlog::info("evdaemon {} created subsystem {}", this->devSn, k); spdlog::info("evdaemon {} created subsystem {}", this->devSn, k);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论