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, support raw update global.listen

Browse source
This commit is contained in:
winlin 2015-08-30 23:18:14 +08:00
parent f8d8c3ace4
commit 364460f2ab
5 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
trunk/src/app/srs_app_server.cpp
View file

@ -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) {