From bd7b3b5eddd6485304290a5e775d97bfb146d254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Thu, 15 Apr 2021 20:09:52 +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/OnPipeMessage.php | 17 ++++++----------
 System/Crontab/Crontab.php          | 31 ++++++++++++-----------------
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/HttpServer/Events/OnPipeMessage.php b/HttpServer/Events/OnPipeMessage.php
index a0c7146c..cd9fa3b6 100644
--- a/HttpServer/Events/OnPipeMessage.php
+++ b/HttpServer/Events/OnPipeMessage.php
@@ -27,17 +27,12 @@ class OnPipeMessage extends Callback
 	public function onHandler(Server $server, int $src_worker_id, $swollen_universalize)
 	{
 		go(function () use ($server, $src_worker_id, $swollen_universalize) {
-			try {
-				match ($swollen_universalize['action'] ?? null) {
-					'kafka' => $this->onKafkaWorker($swollen_universalize),
-					'crontab' => $this->onCrontabWorker($swollen_universalize),
-					default => $this->onMessageWorker($server, $src_worker_id, $swollen_universalize)
-				};
-			} catch (\Throwable $exception) {
-				$this->addError($exception);
-			} finally {
-				fire(Event::SYSTEM_RESOURCE_RELEASES);
-			}
+			match ($swollen_universalize['action'] ?? null) {
+				'kafka' => $this->onKafkaWorker($swollen_universalize),
+				'crontab' => $this->onCrontabWorker($swollen_universalize),
+				default => $this->onMessageWorker($server, $src_worker_id, $swollen_universalize)
+			};
+			fire(Event::SYSTEM_RESOURCE_RELEASES);
 		});
 	}
 
diff --git a/System/Crontab/Crontab.php b/System/Crontab/Crontab.php
index e52a8263..dd2fe02d 100644
--- a/System/Crontab/Crontab.php
+++ b/System/Crontab/Crontab.php
@@ -204,28 +204,23 @@ abstract class Crontab extends BaseObject
 	 */
 	public function execute(): void
 	{
-		try {
-			$redis = Snowflake::app()->getRedis();
+		$redis = Snowflake::app()->getRedis();
 
-			$name_md5 = $this->getName();
+		$name_md5 = $this->getName();
 
-			$redis->hSet(self::WAIT_END, $name_md5, serialize($this));
+		$redis->hSet(self::WAIT_END, $name_md5, serialize($this));
 
-			$params = call_user_func([$this, 'process'], ...$this->params);
-			$redis->hDel(self::WAIT_END, $name_md5);
-			if ($params === null) {
-				return;
-			}
-			$name = date('Y-m-d.log');
-			write(storage($name, '/log/crontab'), Json::encode([
-				'name'     => $this->name,
-				'response' => serialize($params)
-			]));
-		} catch (\Throwable $throwable) {
-			logger()->addError($throwable, 'throwable');
-		} finally {
-			$this->after();
+		$params = call_user_func([$this, 'process'], ...$this->params);
+		$redis->hDel(self::WAIT_END, $name_md5);
+		if ($params === null) {
+			return;
 		}
+		$name = date('Y-m-d.log');
+		write(storage($name, '/log/crontab'), Json::encode([
+			'name'     => $this->name,
+			'response' => serialize($params)
+		]));
+		$this->after();
 	}