From c334dcfd385853d85d1261035de6e386f24de446 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sat, 9 Apr 2022 20:57:00 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=AD=90=E8=BF=9B=E7=A8=8B=E9=87=8D?=
 =?UTF-8?q?=E5=90=AF=E5=A4=B1=E8=B4=A5=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=96=AD?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=EF=BC=8C=E9=81=BF=E5=85=8D=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=20(#1545)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 471a8b77
---
 server/System.cpp | 14 ++------------
 server/main.cpp   |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/server/System.cpp b/server/System.cpp
index f42a4a13..200a0ea5 100644
--- a/server/System.cpp
+++ b/server/System.cpp
@@ -84,7 +84,6 @@ static void sig_crash(int sig) {
 void System::startDaemon() {
 #ifndef _WIN32
     static pid_t pid;
-    static bool is_restart = false;
     do{
         pid = fork();
         if(pid == -1){
@@ -101,26 +100,17 @@ void System::startDaemon() {
 
         //父进程,监视子进程是否退出
         DebugL << "启动子进程:"  << pid;
-        signal(SIGUSR1, [](int) {
-            if (!is_restart){
-                DebugL << "子进程启动错误, 即将退出";
-                kill(pid, SIGINT);
-                exit(0);
-            }else{
-                WarnL << "尝试再次重启子进程";
-            }
-        });
         signal(SIGINT, [](int) {
             WarnL << "收到主动退出信号,关闭父进程与子进程";
             kill(pid,SIGINT);
             exit(0);
         });
+
         do{
             int status = 0;
             if(waitpid(pid, &status, 0) >= 0) {
                 WarnL << "子进程退出";
-                //休眠1秒再启动子进程
-                is_restart = true;
+                //休眠3秒再启动子进程
                 sleep(3);
                 break;
             }
diff --git a/server/main.cpp b/server/main.cpp
index 6227feb0..1b8d1c5e 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -318,7 +318,7 @@ int start_main(int argc,char *argv[]) {
             sleep(1);
 #if !defined(_WIN32)
             if (pid != getpid()) {
-                kill(pid, SIGUSR1);
+                kill(pid, SIGINT);
             }
 #endif
             return -1;