From 98820bd9958dd492ae66e90b2fc81ce3203b30c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Wed, 21 Oct 2020 16:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HttpServer/Events/OnManagerStart.php |  7 -------
 HttpServer/Events/OnStart.php        | 23 ++++++++++++++++-------
 HttpServer/Events/OnWorkerStart.php  |  5 -----
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/HttpServer/Events/OnManagerStart.php b/HttpServer/Events/OnManagerStart.php
index 03b611b4..cb27f279 100644
--- a/HttpServer/Events/OnManagerStart.php
+++ b/HttpServer/Events/OnManagerStart.php
@@ -28,13 +28,6 @@ class OnManagerStart extends Callback
 		if (Snowflake::isLinux()) {
 			name('Server Manager.');
 		}
-
-		pcntl_signal(9 | 15, function () use ($server) {
-			while (pcntl_wifexited(0)) {
-				var_dump(error_get_last());
-				break;
-			}
-		});
 	}
 
 }
diff --git a/HttpServer/Events/OnStart.php b/HttpServer/Events/OnStart.php
index 7d0ba41c..342191a6 100644
--- a/HttpServer/Events/OnStart.php
+++ b/HttpServer/Events/OnStart.php
@@ -30,16 +30,25 @@ class OnStart extends Callback
 			name(rtrim(Config::get('id', 'system:'), ':'));
 		}
 
-		Process::signal(9, function () use ($server) {
-			while ($ret = Process::wait()) {
-				if ($ret['signal'] == 9 || $ret['signal'] == 15) {
-					$server->shutdown();
-				} else {
-					$server->reload();
-				}
+		pcntl_signal(9 | 15, function () use ($server) {
+			$status = 0;
+			while (pcntl_waitpid($server->master_pid,$status)) {
+				var_dump('skill');
+				var_dump(error_get_last());
+				break;
 			}
 		});
 
+//		Process::signal(9, function () use ($server) {
+//			while ($ret = Process::wait()) {
+//				if ($ret['signal'] == 9 || $ret['signal'] == 15) {
+//					$server->shutdown();
+//				} else {
+//					$server->reload();
+//				}
+//			}
+//		});
+
 	}
 
 }
diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php
index 756f64a5..4a7f509d 100644
--- a/HttpServer/Events/OnWorkerStart.php
+++ b/HttpServer/Events/OnWorkerStart.php
@@ -41,11 +41,6 @@ class OnWorkerStart extends Callback
 		if ($worker_id >= $server->setting['worker_num']) {
 			return;
 		}
-		go(function () use ($server) {
-			while ($ret = System::waitPid($server->master_pid)) {
-				var_dump($ret);
-			}
-		});
 		Snowflake::setWorkerId($server->worker_pid);
 		$this->setWorkerAction($worker_id);
 	}