external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

remove the on_reload_vhost_http_remux_updated for vhost added.

Browse source
This commit is contained in:
winlin 2015-08-03 13:35:25 +08:00
parent a62d1cdf2a
commit ccf6a4de1e
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
}

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

@ -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;