external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for #319, http raw api support query. 3.0.3

Browse source
This commit is contained in:
winlin 2015-08-31 23:34:03 +08:00
parent 8a2709dd2c
commit 11c409688b
5 changed files with 78 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

59
trunk/src/app/srs_app_config.cpp
View file

@ -944,14 +944,9 @@ int SrsConfig::reload_conf(SrsConfig* conf)
// merge config: pid
if (!srs_directive_equals(root->get("pid"), old_root->get("pid"))) {
for (it = subscribes.begin(); it != subscribes.end(); ++it) {
ISrsReloadHandler* subscribe = *it;
if ((ret = subscribe->on_reload_pid()) != ERROR_SUCCESS) {
srs_error("notify subscribes reload pid failed. ret=%d", ret);
return ret;
}
if ((ret = do_reload_pid()) != ERROR_SUCCESS) {
return ret;
}
srs_trace("reload pid success.");
}
// merge config: srs_log_tank
@ -2213,21 +2208,47 @@ int SrsConfig::raw_set_listen(const vector<string>& eps, bool& applied)
applied = false;
SrsConfDirective* listen = root->get("listen");
SrsConfDirective* conf = root->get("listen");
// not changed, ignore.
if (srs_vector_actual_equals(listen->args, eps)) {
if (srs_vector_actual_equals(conf->args, eps)) {
return ret;
}
// changed, apply and reload.
listen->args = eps;
conf->args = eps;
if ((ret = do_reload_listen()) != ERROR_SUCCESS) {
return ret;
}
applied = true;
return ret;
}
int SrsConfig::raw_set_pid(string pid, bool& applied)
{
int ret = ERROR_SUCCESS;
applied = false;
SrsConfDirective* conf = root->get_or_create("pid");
if (conf->arg0() == pid) {
return ret;
}
conf->args.clear();
conf->args.push_back(pid);
if ((ret = do_reload_pid()) != ERROR_SUCCESS) {
return ret;
}
applied = true;
return ret;
}
@ -2235,7 +2256,6 @@ int SrsConfig::do_reload_listen()
{
int ret = ERROR_SUCCESS;
// force to reload the memory server.
vector<ISrsReloadHandler*>::iterator it;
for (it = subscribes.begin(); it != subscribes.end(); ++it) {
ISrsReloadHandler* subscribe = *it;
@ -2249,6 +2269,23 @@ int SrsConfig::do_reload_listen()
return ret;
}
int SrsConfig::do_reload_pid()
{
int ret = ERROR_SUCCESS;
vector<ISrsReloadHandler*>::iterator it;
for (it = subscribes.begin(); it != subscribes.end(); ++it) {
ISrsReloadHandler* subscribe = *it;
if ((ret = subscribe->on_reload_pid()) != ERROR_SUCCESS) {
srs_error("notify subscribes reload pid failed. ret=%d", ret);
return ret;
}
}
srs_trace("reload pid success.");
return ret;
}
string SrsConfig::config()
{
return config_file;