Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-04-13 13:35:03 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
cfee761899ea3902c935a4f55efd2c54f469a5b8
cfee7618
1 parent
bb87272c
support full reload. change to 0.9.60
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
8 行增加
和
4 行删除
trunk/src/app/srs_app_config.cpp
trunk/src/core/srs_core.hpp
trunk/src/app/srs_app_config.cpp
查看文件 @
cfee761
...
...
@@ -493,6 +493,13 @@ int SrsConfig::reload()
// merge config.
std
::
vector
<
ISrsReloadHandler
*>::
iterator
it
;
// never support reload:
// daemon
//
// always support reload without additional code:
// chunk_size, ff_log_dir, max_connections,
// bandcheck, http_hooks
// merge config: listen
if
(
!
srs_directive_equals
(
root
->
get
(
"listen"
),
old_root
->
get
(
"listen"
)))
{
for
(
it
=
subscribes
.
begin
();
it
!=
subscribes
.
end
();
++
it
)
{
...
...
@@ -553,9 +560,6 @@ int SrsConfig::reload()
srs_trace
(
"reload srs_log_file success."
);
}
// directly supported for reload:
// chunk_size, ff_log_dir, max_connections
// merge config: pithy_print
if
(
!
srs_directive_equals
(
root
->
get
(
"pithy_print"
),
old_root
->
get
(
"pithy_print"
)))
{
for
(
it
=
subscribes
.
begin
();
it
!=
subscribes
.
end
();
++
it
)
{
...
...
trunk/src/core/srs_core.hpp
查看文件 @
cfee761
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "
59
"
#define VERSION_REVISION "
60
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "srs"
...
...
请
注册
或
登录
后发表评论