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

Support config in_docker to fix the detect fail. (#2824). v4.0.216

Browse source
This commit is contained in:
winlin 2022-01-03 16:55:52 +08:00
parent fd313133b1
commit 7808bd7ca8
6 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/main/srs_main_server.cpp
View file

@ -385,6 +385,14 @@ srs_error_t run_directly_or_daemon()
{
srs_error_t err = srs_success;
// Try to load the config if docker detect failed.
if (!_srs_in_docker) {
_srs_in_docker = _srs_config->get_in_docker();
if (_srs_in_docker) {
srs_trace("enable in_docker by config");
}
}
// Load daemon from config, disable it for docker.
// @see https://github.com/ossrs/srs/issues/1594
bool run_as_daemon = _srs_config->get_daemon();