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

Merge SRS3

Browse source
This commit is contained in:
winlin 2020-03-12 22:42:33 +08:00
commit 1382337cb4
10 changed files with 226 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3490,6 +3490,7 @@ srs_error_t SrsConfig::check_normal_config()
&& n != "utc_time" && n != "work_dir" && n != "asprocess"
&& n != "ff_log_level" && n != "grace_final_wait" && n != "force_grace_quit"
&& n != "grace_start_wait" && n != "empty_ip_ok" && n != "disable_daemon_for_docker"
&& n != "inotify_auto_reload" && n != "auto_reload_for_docker"
) {
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal directive %s", n.c_str());
}
@ -4126,6 +4127,30 @@ bool SrsConfig::disable_daemon_for_docker()
return SRS_CONF_PERFER_TRUE(conf->arg0());
}
bool SrsConfig::inotify_auto_reload()
{
static bool DEFAULT = false;
SrsConfDirective* conf = root->get("inotify_auto_reload");
if (!conf || conf->arg0().empty()) {
return DEFAULT;
}
return SRS_CONF_PERFER_FALSE(conf->arg0());
}
bool SrsConfig::auto_reload_for_docker()
{
static bool DEFAULT = true;
SrsConfDirective* conf = root->get("auto_reload_for_docker");
if (!conf || conf->arg0().empty()) {
return DEFAULT;
}
return SRS_CONF_PERFER_TRUE(conf->arg0());
}
vector<SrsConfDirective*> SrsConfig::get_stream_casters()
{
srs_assert(root);