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
2015-08-03 13:35:25 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ccf6a4de1ea5e03ab81f9f1345e22f8dd510cfdf
ccf6a4de
1 parent
a62d1cdf
remove the on_reload_vhost_http_remux_updated for vhost added.
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
11 行增加
和
12 行删除
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_http_stream.cpp
trunk/src/app/srs_app_config.cpp
查看文件 @
ccf6a4d
...
...
@@ -852,18 +852,6 @@ int SrsConfig::reload_vhost(SrsConfDirective* old_root)
}
}
// TODO: reload new http_remux in on_vhost_add
// http_remux, only one per vhost.
if
(
get_vhost_http_remux_enabled
(
vhost
))
{
for
(
it
=
subscribes
.
begin
();
it
!=
subscribes
.
end
();
++
it
)
{
ISrsReloadHandler
*
subscribe
=
*
it
;
if
((
ret
=
subscribe
->
on_reload_vhost_http_remux_updated
(
vhost
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"vhost %s notify subscribes http_remux failed. ret=%d"
,
vhost
.
c_str
(),
ret
);
return
ret
;
}
}
srs_trace
(
"vhost %s reload http_remux success."
,
vhost
.
c_str
());
}
srs_trace
(
"reload new vhost %s success."
,
vhost
.
c_str
());
continue
;
}
...
...
trunk/src/app/srs_app_http_stream.cpp
查看文件 @
ccf6a4d
...
...
@@ -863,6 +863,17 @@ void SrsHttpStreamServer::http_unmount(SrsSource* s, SrsRequest* r)
entry
->
stream
->
entry
->
enabled
=
false
;
}
int
SrsHttpStreamServer
::
on_reload_vhost_added
(
string
vhost
)
{
int
ret
=
ERROR_SUCCESS
;
if
((
ret
=
on_reload_vhost_http_remux_updated
(
vhost
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
return
ret
;
}
int
SrsHttpStreamServer
::
on_reload_vhost_http_remux_updated
(
string
vhost
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
请
注册
或
登录
后发表评论