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 #1594, detect and disable daemon for docker. 3.0.127

Browse source
This commit is contained in:
winlin 2020-03-12 10:11:41 +08:00
parent c1e07d6a96
commit ed41ca867b
6 changed files with 69 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,7 @@ using namespace std;
#include <srs_core_performance.hpp>
#include <srs_app_utility.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_file.hpp>
// pre-declare
srs_error_t run(SrsServer* svr);
@ -350,6 +351,36 @@ string srs_getenv(const char* name)
return "";
}
// Detect docker by https://stackoverflow.com/a/41559867
srs_error_t srs_detect_docker(bool* is_docker)
{
srs_error_t err = srs_success;
*is_docker = false;
SrsFileReader fr;
if ((err = fr.open("/proc/1/cgroup")) != srs_success) {
return err;
}
ssize_t nn;
char buf[1024];
if ((err = fr.read(buf, sizeof(buf), &nn)) != srs_success) {
return err;
}
if (nn <= 0) {
return err;
}
string s(buf, nn);
if (srs_string_contains(s, "/docker")) {
*is_docker = true;
}
return err;
}
srs_error_t run(SrsServer* svr)
{
srs_error_t err = srs_success;
@ -358,9 +389,23 @@ srs_error_t run(SrsServer* svr)
if ((err = svr->initialize(NULL)) != srs_success) {
return srs_error_wrap(err, "server initialize");
}
// Load daemon from config, disable it for docker.
// @see https://github.com/ossrs/srs/issues/1594
bool in_daemon = _srs_config->get_daemon();
if (in_daemon && _srs_config->disable_daemon_for_docker()) {
bool is_docker = false;
err = srs_detect_docker(&is_docker);
srs_error_reset(err); // Ignore any error while detecting docker.
if (is_docker) {
srs_warn("disable daemon for docker");
in_daemon = false;
}
}
// If not daemon, directly run master.
if (!_srs_config->get_daemon()) {
if (!in_daemon) {
if ((err = run_master(svr)) != srs_success) {
return srs_error_wrap(err, "run master");
}