external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

refine code for http remux reload.

Browse source
This commit is contained in:
winlin 2015-07-10 13:45:21 +08:00
parent 0aa053433c
commit 50feaacdde
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/app/srs_app_config.cpp
View file

@ -853,6 +853,7 @@ int SrsConfig::reload_vhost(SrsConfDirective* old_root)
} }
} }
// TODO: reload new http_remux in on_vhost_add
// http_remux, only one per vhost. // http_remux, only one per vhost.
if (get_vhost_http_remux_enabled(vhost)) { if (get_vhost_http_remux_enabled(vhost)) {
for (it = subscribes.begin(); it != subscribes.end(); ++it) { for (it = subscribes.begin(); it != subscribes.end(); ++it) {

4
trunk/src/app/srs_app_http_stream.cpp
View file

@ -1228,7 +1228,9 @@ int SrsHttpStreamServer::initialize_flv_streaming()
continue; continue;
} }
initialize_flv_entry(conf->arg0()); if ((ret = initialize_flv_entry(conf->arg0())) != ERROR_SUCCESS) {
return ret;
}
} }
return ret; return ret;
} }