From bfee7ca9628c2723fce77f9ac7457343adaafd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Thu, 4 Mar 2021 10:48:29 +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/OnWorkerStart.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php
index 296345bd..833d6f30 100644
--- a/HttpServer/Events/OnWorkerStart.php
+++ b/HttpServer/Events/OnWorkerStart.php
@@ -40,28 +40,31 @@ class OnWorkerStart extends Callback
 		annotation()->read(APP_PATH . 'app', 'App');
 		$this->debug(sprintf('scan app dir use time %s', microtime(true) - $start));
 
+		$prefix = sprintf('%s #%d Pid:%d start.', ucfirst(env('environmental')), $worker_id, $server->worker_pid);
+
 		if ($worker_id >= $server->setting['worker_num']) {
-			$this->onTask($server, $worker_id);
+			$this->onTask($server, $worker_id, $prefix);
 		} else {
-			$this->onWorker($server, $worker_id);
+			$this->onWorker($server, $worker_id, $prefix);
 		}
-		$this->debug(sprintf('%s #%d Pid:%d start.', ucfirst(env('environmental')), $worker_id, $server->worker_pid));
 	}
 
 
 	/**
 	 * @param Server $server
 	 * @param int $worker_id
-	 * @throws ComponentException|ConfigException
+	 * @param $prefix
+	 * @throws ComponentException
+	 * @throws ConfigException
 	 */
-	public function onTask(Server $server, int $worker_id)
+	public function onTask(Server $server, int $worker_id, $prefix)
 	{
 		putenv('environmental=' . Snowflake::TASK);
 
 
 		$start = microtime(true);
 		fire(Event::SERVER_TASK_START);
-		$this->debug(sprintf('Event::SERVER_WORKER_START use time %s', microtime(true) - $start));
+		$this->debug(sprintf('%s use time %s', $prefix, microtime(true) - $start));
 
 		$this->set_process_name($server, $worker_id);
 	}
@@ -70,17 +73,19 @@ class OnWorkerStart extends Callback
 	/**
 	 * @param Server $server
 	 * @param int $worker_id
+	 * @param $prefix
+	 * @throws ComponentException
+	 * @throws ConfigException
 	 * @throws Exception
-	 * onWorker
 	 */
-	public function onWorker(Server $server, int $worker_id)
+	public function onWorker(Server $server, int $worker_id, $prefix)
 	{
 		Snowflake::setWorkerId($server->worker_pid);
 		putenv('environmental=' . Snowflake::WORKER);
 		try {
 			$start = microtime(true);
 			fire(Event::SERVER_WORKER_START, [$worker_id]);
-			$this->debug(sprintf('Event::SERVER_WORKER_START use time %s', microtime(true) - $start));
+			$this->debug(sprintf('%s use time %s', $prefix, microtime(true) - $start));
 		} catch (\Throwable $exception) {
 			$this->addError($exception);
 			write($exception->getMessage(), 'worker');