amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-12-02 00:12:33 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复子进程日志路径固定的问题

Browse Source
This commit is contained in:
xiongziliang 2020-06-11 09:22:28 +08:00
parent 9c646d1316
commit 6b7e4f5f52
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/Process.cpp
View File

@ -70,6 +70,11 @@ void Process::run(const string &cmd, const string &log_file_tmp) {
} }
fclose(fp); fclose(fp);
#else #else
_pid = fork();
if (_pid < 0) {
throw std::runtime_error(StrPrinter << "fork child process failed,err:" << get_uv_errmsg());
}
if (_pid == 0) {
string log_file; string log_file;
if (log_file_tmp.empty()) { if (log_file_tmp.empty()) {
//未指定子进程日志文件时，重定向至/dev/null //未指定子进程日志文件时，重定向至/dev/null
@ -77,12 +82,6 @@ void Process::run(const string &cmd, const string &log_file_tmp) {
} else { } else {
log_file = StrPrinter << log_file_tmp << "." << getpid(); log_file = StrPrinter << log_file_tmp << "." << getpid();
} }
_pid = fork();
if (_pid < 0) {
throw std::runtime_error(StrPrinter << "fork child process failed,err:" << get_uv_errmsg());
}
if (_pid == 0) {
//子进程关闭core文件生成 //子进程关闭core文件生成
struct rlimit rlim = {0, 0}; struct rlimit rlim = {0, 0};
setrlimit(RLIMIT_CORE, &rlim); setrlimit(RLIMIT_CORE, &rlim);
@ -132,6 +131,13 @@ void Process::run(const string &cmd, const string &log_file_tmp) {
exit(ret); exit(ret);
} }
string log_file;
if (log_file_tmp.empty()) {
//未指定子进程日志文件时，重定向至/dev/null
log_file = "/dev/null";
} else {
log_file = StrPrinter << log_file_tmp << "." << _pid;
}
InfoL << "start child process " << _pid << ", log file:" << log_file; InfoL << "start child process " << _pid << ", log file:" << log_file;
#endif // _WIN32 #endif // _WIN32
} }