正在显示
2 个修改的文件
包含
4 行增加
和
1 行删除
| @@ -853,6 +853,7 @@ int SrsConfig::reload_vhost(SrsConfDirective* old_root) | @@ -853,6 +853,7 @@ int SrsConfig::reload_vhost(SrsConfDirective* old_root) | ||
| 853 | } | 853 | } |
| 854 | } | 854 | } |
| 855 | 855 | ||
| 856 | + // TODO: reload new http_remux in on_vhost_add | ||
| 856 | // http_remux, only one per vhost. | 857 | // http_remux, only one per vhost. |
| 857 | if (get_vhost_http_remux_enabled(vhost)) { | 858 | if (get_vhost_http_remux_enabled(vhost)) { |
| 858 | for (it = subscribes.begin(); it != subscribes.end(); ++it) { | 859 | for (it = subscribes.begin(); it != subscribes.end(); ++it) { |
| @@ -1228,7 +1228,9 @@ int SrsHttpStreamServer::initialize_flv_streaming() | @@ -1228,7 +1228,9 @@ int SrsHttpStreamServer::initialize_flv_streaming() | ||
| 1228 | continue; | 1228 | continue; |
| 1229 | } | 1229 | } |
| 1230 | 1230 | ||
| 1231 | - initialize_flv_entry(conf->arg0()); | 1231 | + if ((ret = initialize_flv_entry(conf->arg0())) != ERROR_SUCCESS) { |
| 1232 | + return ret; | ||
| 1233 | + } | ||
| 1232 | } | 1234 | } |
| 1233 | return ret; | 1235 | return ret; |
| 1234 | } | 1236 | } |
-
请 注册 或 登录 后发表评论