From 95b4a3e80b54956725e10884d23dd72fab4d61a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Tue, 19 Oct 2021 15:07:02 +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

---
 http-server/Constant.php                    |  1 +
 http-server/Events/OnBeforeShutdown.php     | 18 ++++++++
 http-server/Manager/OnServer.php            | 28 +++++++-----
 http-server/SInterface/OnBeforeShutdown.php |  8 ++++
 http-server/ServerManager.php               | 49 ++++++++++-----------
 5 files changed, 69 insertions(+), 35 deletions(-)
 create mode 100644 http-server/Events/OnBeforeShutdown.php
 create mode 100644 http-server/SInterface/OnBeforeShutdown.php

diff --git a/http-server/Constant.php b/http-server/Constant.php
index 92802d4e..5710e84b 100644
--- a/http-server/Constant.php
+++ b/http-server/Constant.php
@@ -13,6 +13,7 @@ class Constant
 
 	const START = 'Start';
 	const SHUTDOWN = 'Shutdown';
+	const BEFORE_SHUTDOWN = 'beforeShutdown';
 	const WORKER_START = 'WorkerStart';
 	const WORKER_STOP = 'WorkerStop';
 	const WORKER_EXIT = 'WorkerExit';
diff --git a/http-server/Events/OnBeforeShutdown.php b/http-server/Events/OnBeforeShutdown.php
new file mode 100644
index 00000000..d9614699
--- /dev/null
+++ b/http-server/Events/OnBeforeShutdown.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Server\Events;
+
+use Swoole\Server;
+
+class OnBeforeShutdown
+{
+
+
+	/**
+	 * @param Server|null $server
+	 */
+	public function __construct(?Server $server = null)
+	{
+	}
+
+}
diff --git a/http-server/Manager/OnServer.php b/http-server/Manager/OnServer.php
index ff8f09c3..986a777d 100644
--- a/http-server/Manager/OnServer.php
+++ b/http-server/Manager/OnServer.php
@@ -3,11 +3,12 @@
 namespace Server\Manager;
 
 use Annotation\Inject;
-use Server\Abstracts\Server;
-use Server\Events\OnShutdown;
-use Server\Events\OnStart;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
+use Server\Abstracts\Server;
+use Server\Events\OnBeforeShutdown;
+use Server\Events\OnShutdown;
+use Server\Events\OnStart;
 
 
 /**
@@ -25,18 +26,26 @@ class OnServer extends Server
 
 
 	/**
-     * @param \Swoole\Server $server
-     * @throws ConfigException
-     */
+	 * @param \Swoole\Server $server
+	 * @throws ConfigException
+	 */
 	public function onStart(\Swoole\Server $server)
 	{
-        $this->setProcessName(sprintf('start[%d].server', $server->master_pid));
+		$this->setProcessName(sprintf('start[%d].server', $server->master_pid));
 
-        $this->eventDispatch->dispatch(new OnStart($server));
+		$this->eventDispatch->dispatch(new OnStart($server));
+	}
+
+
+	/**
+	 * @param \Swoole\Server $server
+	 */
+	public function onBeforeShutdown(\Swoole\Server $server)
+	{
+		$this->eventDispatch->dispatch(new OnBeforeShutdown($server));
 	}
 
 
-	
 	/**
 	 * @param \Swoole\Server $server
 	 */
@@ -46,5 +55,4 @@ class OnServer extends Server
 	}
 
 
-
 }
diff --git a/http-server/SInterface/OnBeforeShutdown.php b/http-server/SInterface/OnBeforeShutdown.php
new file mode 100644
index 00000000..9e70758b
--- /dev/null
+++ b/http-server/SInterface/OnBeforeShutdown.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Server\SInterface;
+
+interface OnBeforeShutdown
+{
+
+}
diff --git a/http-server/ServerManager.php b/http-server/ServerManager.php
index 98485e75..81f7a2d1 100644
--- a/http-server/ServerManager.php
+++ b/http-server/ServerManager.php
@@ -14,13 +14,13 @@ use Server\Manager\OnPipeMessage;
 use Server\Manager\OnServer;
 use Server\Manager\OnServerManager;
 use Server\Manager\OnServerReload;
-use Server\SInterface\OnProcessInterface;
 use Server\SInterface\OnCloseInterface;
 use Server\SInterface\OnConnectInterface;
 use Server\SInterface\OnDisconnectInterface;
 use Server\SInterface\OnHandshakeInterface;
 use Server\SInterface\OnMessageInterface;
 use Server\SInterface\OnPacketInterface;
+use Server\SInterface\OnProcessInterface;
 use Server\SInterface\OnReceiveInterface;
 use Server\SInterface\OnTaskInterface;
 use Server\Task\OnServerTask;
@@ -62,30 +62,29 @@ class ServerManager
 
 
 	const DEFAULT_EVENT = [
-		Constant::WORKER_START  => [OnServerWorker::class, 'onWorkerStart'],
-		Constant::WORKER_EXIT   => [OnServerWorker::class, 'onWorkerExit'],
-		Constant::WORKER_STOP   => [OnServerWorker::class, 'onWorkerStop'],
-		Constant::WORKER_ERROR  => [OnServerWorker::class, 'onWorkerError'],
-		Constant::MANAGER_START => [OnServerManager::class, 'onManagerStart'],
-		Constant::MANAGER_STOP  => [OnServerManager::class, 'onManagerStop'],
-		Constant::BEFORE_RELOAD => [OnServerReload::class, 'onBeforeReload'],
-		Constant::AFTER_RELOAD  => [OnServerReload::class, 'onAfterReload'],
-		Constant::START         => [OnServer::class, 'onStart'],
-		Constant::SHUTDOWN      => [OnServer::class, 'onShutdown'],
+		Constant::WORKER_START    => [OnServerWorker::class, 'onWorkerStart'],
+		Constant::WORKER_EXIT     => [OnServerWorker::class, 'onWorkerExit'],
+		Constant::WORKER_STOP     => [OnServerWorker::class, 'onWorkerStop'],
+		Constant::WORKER_ERROR    => [OnServerWorker::class, 'onWorkerError'],
+		Constant::MANAGER_START   => [OnServerManager::class, 'onManagerStart'],
+		Constant::MANAGER_STOP    => [OnServerManager::class, 'onManagerStop'],
+		Constant::BEFORE_RELOAD   => [OnServerReload::class, 'onBeforeReload'],
+		Constant::AFTER_RELOAD    => [OnServerReload::class, 'onAfterReload'],
+		Constant::START           => [OnServer::class, 'onStart'],
+		Constant::BEFORE_SHUTDOWN => [OnServer::class, 'onBeforeShutdown'],
+		Constant::SHUTDOWN        => [OnServer::class, 'onShutdown'],
 	];
 
 
-
-    private array $eventInterface = [
-        OnReceiveInterface::class    => 'receive',
-        OnPacketInterface::class     =>'packet',
-        OnHandshakeInterface::class  => 'handshake',
-        OnMessageInterface::class    =>'message',
-        OnConnectInterface::class    =>'connect',
-        OnCloseInterface::class      =>'close',
-        OnDisconnectInterface::class =>'disconnect'
-    ];
-
+	private array $eventInterface = [
+		OnReceiveInterface::class    => 'receive',
+		OnPacketInterface::class     => 'packet',
+		OnHandshakeInterface::class  => 'handshake',
+		OnMessageInterface::class    => 'message',
+		OnConnectInterface::class    => 'connect',
+		OnCloseInterface::class      => 'close',
+		OnDisconnectInterface::class => 'disconnect'
+	];
 
 
 	/**
@@ -189,9 +188,9 @@ class ServerManager
 			}
 
 			$name = $customProcess->getProcessName($soloProcess);
-            if (is_enable_file_modification_listening()) {
-                scan_directory(directory('app'), 'App');
-            }
+			if (is_enable_file_modification_listening()) {
+				scan_directory(directory('app'), 'App');
+			}
 
 			$system = sprintf('%s.process[%d]', Config::get('id', 'system-service'), $soloProcess->pid);
 			if (Kiri::getPlatform()->isLinux()) {