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
2015-08-30 23:18:14 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
364460f2ab04b593fe2ab98c65f28931a23d4c70
364460f2
1 parent
f8d8c3ac
for #319, support raw update global.listen
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
37 行增加
和
14 行删除
trunk/conf/compatible.conf
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_config.hpp
trunk/src/app/srs_app_http_api.cpp
trunk/src/app/srs_app_server.cpp
trunk/conf/compatible.conf
查看文件 @
364460f
...
...
@@ -7,7 +7,7 @@ daemon off;
http_api
{
enabled
on
;
listen
1985
;
#
crossdomain on;
crossdomain
on
;
raw_api
{
enabled
on
;
allow_reload
on
;
...
...
trunk/src/app/srs_app_config.cpp
查看文件 @
364460f
...
...
@@ -2175,6 +2175,16 @@ int SrsConfig::raw_to_json(SrsAmf0Object* obj)
return
ret
;
}
int
SrsConfig
::
raw_set_listen
(
const
vector
<
string
>&
eps
)
{
int
ret
=
ERROR_SUCCESS
;
SrsConfDirective
*
listen
=
root
->
get
(
"listen"
);
listen
->
args
=
eps
;
return
ret
;
}
string
SrsConfig
::
config
()
{
return
config_file
;
...
...
trunk/src/app/srs_app_config.hpp
查看文件 @
364460f
...
...
@@ -329,6 +329,10 @@ public:
* dumps the http_api sections to json for raw api info.
*/
virtual
int
raw_to_json
(
SrsAmf0Object
*
obj
);
/**
* raw set the global listen.
*/
virtual
int
raw_set_listen
(
const
std
::
vector
<
std
::
string
>&
eps
);
public
:
/**
* get the config file path.
...
...
trunk/src/app/srs_app_http_api.cpp
查看文件 @
364460f
...
...
@@ -1006,11 +1006,20 @@ int SrsGoApiRaw::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
}
if
(
invalid
)
{
ret
=
ERROR_SYSTEM_CONFIG_RAW_PARAMS
;
srs_error
(
"raw api update global.listen invalid eps=%s. ret=%d"
,
value
.
c_str
(),
ret
);
srs_error
(
"raw api update global.listen=%s failed. ret=%d"
,
value
.
c_str
(),
ret
);
return
srs_api_response_code
(
w
,
r
,
ret
);
}
if
((
ret
=
_srs_config
->
raw_set_listen
(
eps
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"raw api update global.listen=%s failed. ret=%d"
,
value
.
c_str
(),
ret
);
return
srs_api_response_code
(
w
,
r
,
ret
);
}
}
server
->
on_signal
(
SRS_SIGNAL_RELOAD
);
server
->
on_signal
(
SRS_SIGNAL_PERSISTENCE_CONFIG
);
srs_trace
(
"raw api update %s=%s ok."
,
scope
.
c_str
(),
value
.
c_str
());
return
srs_api_response
(
w
,
r
,
obj
->
to_json
());
}
...
...
trunk/src/app/srs_app_server.cpp
查看文件 @
364460f
...
...
@@ -994,18 +994,6 @@ int SrsServer::do_cycle()
return
ret
;
}
#endif
// do reload the config.
if
(
signal_reload
)
{
signal_reload
=
false
;
srs_info
(
"get signal to reload the config."
);
if
((
ret
=
_srs_config
->
reload
())
!=
ERROR_SUCCESS
)
{
srs_error
(
"reload config failed. ret=%d"
,
ret
);
return
ret
;
}
srs_trace
(
"reload config success."
);
}
// do persistence config to file.
if
(
signal_persistence_config
)
{
...
...
@@ -1018,6 +1006,18 @@ int SrsServer::do_cycle()
}
srs_trace
(
"persistence config to file success."
);
}
// do reload the config.
if
(
signal_reload
)
{
signal_reload
=
false
;
srs_info
(
"get signal to reload the config."
);
if
((
ret
=
_srs_config
->
reload
())
!=
ERROR_SUCCESS
)
{
srs_error
(
"reload config failed. ret=%d"
,
ret
);
return
ret
;
}
srs_trace
(
"reload config success."
);
}
// notice the stream sources to cycle.
if
((
ret
=
SrsSource
::
cycle_all
())
!=
ERROR_SUCCESS
)
{
...
...
请
注册
或
登录
后发表评论