amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 03:10:04 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Revert "子进程重启失败时，不断重试，避免重启失败 (#1545)"

Browse Source 
This reverts commit 471a8b77
This commit is contained in:
xiongziliang 2022-04-09 20:57:00 +08:00
parent 471a8b7735
commit c334dcfd38
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/System.cpp
View File

@ -84,7 +84,6 @@ static void sig_crash(int sig) {
void System::startDaemon() { void System::startDaemon() {
#ifndef _WIN32 #ifndef _WIN32
static pid_t pid; static pid_t pid;
static bool is_restart = false;
do{ do{
pid = fork(); pid = fork();
if(pid == -1){ if(pid == -1){
@ -101,26 +100,17 @@ void System::startDaemon() {
//父进程,监视子进程是否退出 //父进程,监视子进程是否退出
DebugL << "启动子进程:" << pid; DebugL << "启动子进程:" << pid;
signal(SIGUSR1, [](int) {
if (!is_restart){
DebugL << "子进程启动错误, 即将退出";
kill(pid, SIGINT);
exit(0);
}else{
WarnL << "尝试再次重启子进程";
}
});
signal(SIGINT, [](int) { signal(SIGINT, [](int) {
WarnL << "收到主动退出信号,关闭父进程与子进程"; WarnL << "收到主动退出信号,关闭父进程与子进程";
kill(pid,SIGINT); kill(pid,SIGINT);
exit(0); exit(0);
}); });
do{ do{
int status = 0; int status = 0;
if(waitpid(pid, &status, 0) >= 0) { if(waitpid(pid, &status, 0) >= 0) {
WarnL << "子进程退出"; WarnL << "子进程退出";
//休眠1秒再启动子进程 //休眠3秒再启动子进程
is_restart = true;
sleep(3); sleep(3);
break; break;
} }

2
server/main.cpp
View File

@ -318,7 +318,7 @@ int start_main(int argc,char *argv[]) {
sleep(1); sleep(1);
#if !defined(_WIN32) #if !defined(_WIN32)
if (pid != getpid()) { if (pid != getpid()) {
kill(pid, SIGUSR1); kill(pid, SIGINT);
} }
#endif #endif
return -1; return -1;