Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
E
evsuits
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
OpsTeam
evsuits
Commits
4d464e76
提交
4d464e76
authored
9月 11, 2019
作者:
blu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
big refacting of communitation architect
上级
1f1cb63f
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
4 行增加
和
47 行删除
+4
-47
evdaemon.cpp
opencv-motion-detect/evdaemon.cpp
+4
-47
没有找到文件。
opencv-motion-detect/evdaemon.cpp
浏览文件 @
4d464e76
...
...
@@ -30,6 +30,7 @@ class EvDaemon{
private
:
Server
svr
;
json
config
;
json
deltaCfg
;
json
info
;
int
port
=
8088
;
thread
thMon
;
...
...
@@ -203,50 +204,6 @@ class EvDaemon{
thMon
.
detach
();
}
int
startSubModule
(
string
peerId
)
{
int
ret
=
0
;
if
(
peerData
[
"status"
].
count
(
peerId
)
==
0
||
peerData
[
"status"
][
peerId
]
==
0
)
{
//
}
else
if
(
peerData
[
"pids"
].
count
(
peerId
)
!=
0
){
kill
(
peerData
[
"pids"
][
peerId
],
SIGTERM
);
peerData
[
"pids"
].
erase
(
peerId
);
peerData
[
"status"
][
peerId
]
=
0
;
}
json
jret
=
cloudutils
::
reqConfig
(
this
->
info
);
// apply config
try
{
if
(
jret
[
"code"
]
!=
0
)
{
spdlog
::
error
(
"evdaemon {} request cloud configration error: {}"
,
this
->
devSn
,
jret
[
"msg"
].
get
<
string
>
());
return
2
;
}
json
*
cfg
=
cfgutils
::
findModuleConfig
(
peerId
,
jret
[
"data"
]);
json
diff
=
json
::
diff
(
this
->
config
,
jret
[
"data"
]);
// TODO:
spdlog
::
info
(
"evdaemon {} config diff: {}"
,
devSn
,
diff
.
dump
());
if
(
cfg
==
NULL
)
{
spdlog
::
error
(
"evdaemon failed to find module {} in config {}"
,
peerId
,
jret
[
"data"
].
dump
());
return
1
;
}
peerData
[
"config"
][
peerId
]
=
*
cfg
;
peerData
[
"status"
][
peerId
]
=
0
;
pid_t
pid
;
ret
=
zmqhelper
::
forkSubsystem
(
devSn
,
peerId
,
portRouter
,
pid
);
if
(
ret
!=
0
)
{
spdlog
::
error
(
"evdaemon {} failed to fork subsystem: {}"
,
devSn
,
peerId
);
// TODO: clean up and reload config
return
-
3
;
}
this
->
peerData
[
"pids"
][
peerId
]
=
pid
;
}
catch
(
exception
&
e
)
{
spdlog
::
error
(
"evdaemon {} exception : {}"
,
devSn
,
e
.
what
());
return
-
1
;
}
return
0
;
}
int
handleEdgeMsg
(
vector
<
vector
<
uint8_t
>
>
&
body
)
{
int
ret
=
0
;
...
...
@@ -417,11 +374,11 @@ class EvDaemon{
if
(
data
.
size
()
==
0
)
{
spdlog
::
error
(
"evdaemon {} received invalid empty config"
,
devSn
);
}
else
{
json
diff
=
json
::
diff
(
this
->
config
,
data
);
if
(
diff
.
size
()
!=
0
)
{
this
->
deltaCfg
=
json
::
diff
(
this
->
config
,
data
);
if
(
this
->
deltaCfg
.
size
()
!=
0
)
{
this
->
config
=
data
;
this
->
bReload
=
true
;
spdlog
::
info
(
"evdaemon {} received cloud config diff
. origin:
\n
{}
\n
new
\n
{}"
,
devSn
,
this
->
config
.
dump
(
),
data
.
dump
());
spdlog
::
info
(
"evdaemon {} received cloud config diff
:
\n
{}
\n
new
\n
{}"
,
devSn
,
this
->
deltaCfg
.
dump
(
4
),
data
.
dump
());
// TODO: detailed diff on submodules
}
else
{
spdlog
::
info
(
"evdaemon {} received same configuration and ignored: {}"
,
devSn
,
data
.
dump
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论