Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-04-13 13:50:58 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
aa784377fd7f2f503f4dcc9d43d642744dbeb50b
aa784377
1 parent
cfee7618
refine reload, ignore if parse config file failed.
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
3 行增加
和
4 行删除
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_config.cpp
查看文件 @
aa78437
...
...
@@ -477,13 +477,12 @@ int SrsConfig::reload()
SrsConfig
conf
;
if
((
ret
=
conf
.
parse_file
(
config_file
.
c_str
()))
!=
ERROR_SUCCESS
)
{
srs_error
(
"config reloader parse file failed. ret=%d"
,
ret
);
srs_error
(
"ignore config reloader parse file failed. ret=%d"
,
ret
);
ret
=
ERROR_SUCCESS
;
return
ret
;
}
srs_info
(
"config reloader parse file success."
);
// store current root to old_root,
// and reap the root from conf to current root.
SrsConfDirective
*
old_root
=
root
;
SrsAutoFree
(
SrsConfDirective
,
old_root
,
false
);
...
...
@@ -792,7 +791,7 @@ int SrsConfig::reload_vhost(SrsConfDirective* old_root)
// ENABLED => ENABLED (modified)
if
(
get_vhost_enabled
(
new_vhost
)
&&
get_vhost_enabled
(
old_vhost
))
{
srs_trace
(
"vhost %s modified, reload its detail."
,
vhost
.
c_str
());
srs_trace
(
"vhost %s m
aybe m
odified, reload its detail."
,
vhost
.
c_str
());
// atc, only one per vhost
if
(
!
srs_directive_equals
(
new_vhost
->
get
(
"atc"
),
old_vhost
->
get
(
"atc"
)))
{
for
(
it
=
subscribes
.
begin
();
it
!=
subscribes
.
end
();
++
it
)
{
...
...
请
注册
或
登录
后发表评论