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 branch '4.0release' into merge/develop

Browse source
This commit is contained in:
winlin 2021-05-18 11:46:46 +08:00
commit 98cd8145cc
5 changed files with 44 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
trunk/conf/full.conf
View file

@ -33,7 +33,7 @@ ff_log_level info;
# if console, print log to console.
# if file, write log to file. requires srs_log_file if log to file.
# default: file.
srs_log_tank file;
srs_log_tank console;
# the log level, for all log tanks.
# can be: verbose, info, trace, warn, error
# default: trace
@ -48,7 +48,7 @@ max_connections 1000;
# whether start as daemon
# @remark: do not support reload.
# default: on
daemon on;
daemon off;
# whether use utc_time to generate the time struct,
# if off, use localtime() to generate it,
# if on, use gmtime() instead, which use UTC time.
@ -2228,3 +2228,11 @@ vhost b.origin.cluster.srs.com {
coworkers 127.0.0.1:9090;
}
}
#############################################################################################
# To prevent user to use full.conf
#############################################################################################
# To identify the full.conf
# @remark Should never use it directly, it's only a collections of all config items.
# Default: off
is_full on;