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

Ingest: Exit if child process redirect io failed (#2540)

Browse source 
* 修复子进程无法打开日志输出重定向导致的fork错误

srs进程fork后，未能输出重定向而返回错误，导致fork的子进程未能出。

* remove the var child_err

* Fixed IO redirection error detection

* Fixed BUG where lost during logs on normal start
This commit is contained in:
rise 2021-08-25 07:16:46 +08:00 • committed by GitHub
parent 0859fb5298
commit a00b4d2014
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

43
trunk/src/app/srs_app_process.cpp
View file

@ -153,6 +153,30 @@ srs_error_t srs_redirect_output(string from_file, int to_fd)
return err;
}
srs_error_t SrsProcess::redirect_io()
{
srs_error_t err = srs_success;
// for the stdout, ignore when not specified.
// redirect stdout to file if possible.
if ((err = srs_redirect_output(stdout_file, STDOUT_FILENO)) != srs_success) {
return srs_error_wrap(err, "redirect stdout");
}
// for the stderr, ignore when not specified.
// redirect stderr to file if possible.
if ((err = srs_redirect_output(stderr_file, STDERR_FILENO)) != srs_success) {
return srs_error_wrap(err, "redirect stderr");
}
// No stdin for process, @bug https://github.com/ossrs/srs/issues/1592
if ((err = srs_redirect_output("/dev/null", STDIN_FILENO)) != srs_success) {
return srs_error_wrap(err, "redirect /dev/null");
}
return err;
}
srs_error_t SrsProcess::start()
{
srs_error_t err = srs_success;
@ -183,21 +207,10 @@ srs_error_t SrsProcess::start()
signal(SIGINT, SIG_IGN);
signal(SIGTERM, SIG_IGN);
// for the stdout, ignore when not specified.
// redirect stdout to file if possible.
if ((err = srs_redirect_output(stdout_file, STDOUT_FILENO)) != srs_success) {
return srs_error_wrap(err, "redirect output");
}
// for the stderr, ignore when not specified.
// redirect stderr to file if possible.
if ((err = srs_redirect_output(stderr_file, STDERR_FILENO)) != srs_success) {
return srs_error_wrap(err, "redirect output");
}
// No stdin for process, @bug https://github.com/ossrs/srs/issues/1592
if ((err = srs_redirect_output("/dev/null", STDIN_FILENO)) != srs_success) {
return srs_error_wrap(err, "redirect input");
// redirect standard I/O, if it failed, output error to stdout, and exit child process.
if ((err = redirect_io()) != srs_success) {
fprintf(stdout, "child process error, %s\n", srs_error_desc(err).c_str());
exit(-1);
}
// should never close the fd 3+, for it myabe used.

3
trunk/src/app/srs_app_process.hpp
View file

@ -53,6 +53,9 @@ public:
// @param argv the argv for binary path, the argv[0] generally is the binary.
// @remark the argv[0] must be the binary.
virtual srs_error_t initialize(std::string binary, std::vector<std::string> argv);
private:
// Redirect standard I/O.
virtual srs_error_t redirect_io();
public:
// Start the process, ignore when already started.
virtual srs_error_t start();