diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index a5fd507bf..c6404a436 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -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; } diff --git a/trunk/src/app/srs_app_http_stream.cpp b/trunk/src/app/srs_app_http_stream.cpp index cc41986cb..4702269b9 100644 --- a/trunk/src/app/srs_app_http_stream.cpp +++ b/trunk/src/app/srs_app_http_stream.cpp @@ -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;