正在显示
2 个修改的文件
包含
8 行增加
和
4 行删除
@@ -493,6 +493,13 @@ int SrsConfig::reload() | @@ -493,6 +493,13 @@ int SrsConfig::reload() | ||
493 | // merge config. | 493 | // merge config. |
494 | std::vector<ISrsReloadHandler*>::iterator it; | 494 | std::vector<ISrsReloadHandler*>::iterator it; |
495 | 495 | ||
496 | + // never support reload: | ||
497 | + // daemon | ||
498 | + // | ||
499 | + // always support reload without additional code: | ||
500 | + // chunk_size, ff_log_dir, max_connections, | ||
501 | + // bandcheck, http_hooks | ||
502 | + | ||
496 | // merge config: listen | 503 | // merge config: listen |
497 | if (!srs_directive_equals(root->get("listen"), old_root->get("listen"))) { | 504 | if (!srs_directive_equals(root->get("listen"), old_root->get("listen"))) { |
498 | for (it = subscribes.begin(); it != subscribes.end(); ++it) { | 505 | for (it = subscribes.begin(); it != subscribes.end(); ++it) { |
@@ -552,9 +559,6 @@ int SrsConfig::reload() | @@ -552,9 +559,6 @@ int SrsConfig::reload() | ||
552 | } | 559 | } |
553 | srs_trace("reload srs_log_file success."); | 560 | srs_trace("reload srs_log_file success."); |
554 | } | 561 | } |
555 | - | ||
556 | - // directly supported for reload: | ||
557 | - // chunk_size, ff_log_dir, max_connections | ||
558 | 562 | ||
559 | // merge config: pithy_print | 563 | // merge config: pithy_print |
560 | if (!srs_directive_equals(root->get("pithy_print"), old_root->get("pithy_print"))) { | 564 | if (!srs_directive_equals(root->get("pithy_print"), old_root->get("pithy_print"))) { |
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
31 | // current release version | 31 | // current release version |
32 | #define VERSION_MAJOR "0" | 32 | #define VERSION_MAJOR "0" |
33 | #define VERSION_MINOR "9" | 33 | #define VERSION_MINOR "9" |
34 | -#define VERSION_REVISION "59" | 34 | +#define VERSION_REVISION "60" |
35 | #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION | 35 | #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION |
36 | // server info. | 36 | // server info. |
37 | #define RTMP_SIG_SRS_KEY "srs" | 37 | #define RTMP_SIG_SRS_KEY "srs" |
-
请 注册 或 登录 后发表评论