modify

HttpServer/Events/OnPipeMessage.php

@@ -48,25 +48,7 @@ class OnPipeMessage extends Callback
 		if (empty($message['handler'] ?? null)) {
 			throw new Exception('unknown handler');
 		}
-		/** @var Crontab $handler */
+        $message['handler']->increment()->execute();
-		$handler = $message['handler'];
-		defer(function () use ($handler) {
-			if ($handler->isRecover() !== 999) {
-				return;
-			}
-			$redis = Snowflake::app()->getRedis();
-
-			$name = $handler->getName();
-			if (!$redis->exists('stop:crontab:' . $name)) {
-				$redis->set('crontab:' . $name, swoole_serialize($handler));
-				$tickTime = time() + $handler->getTickTime();
-				$redis->zAdd(Producer::CRONTAB_KEY, $tickTime, $name);
-			} else {
-				$redis->del('crontab:' . $name);
-				$redis->del('stop:crontab:' . $name);
-			}
-		});
-		$handler->increment()->execute();
 		return 'success';
 	}
 

System/Crontab/Crontab.php

@@ -189,10 +189,42 @@ abstract class Crontab extends BaseObject
      */
     public function execute(): void
     {
-		defer(function () {
+        defer(fn() => $this->afterExecute());
-			$this->isRecover();
+        try {
-		});
+            $redis = Snowflake::app()->getRedis();
-		$this->run();
+
+            $name_md5 = $this->getName();
+
+            $redis->hSet(self::WAIT_END, $name_md5, static::getSerialize($this));
+
+            $params = call_user_func([$this, 'process'], ...$this->params);
+            $redis->hDel(self::WAIT_END, $name_md5);
+            if ($params === null) {
+                return;
+            }
+            write(Json::encode(['name' => $this->name, 'response' => serialize($params)]), 'crontab');
+        } catch (\Throwable $throwable) {
+            logger()->addError($throwable, 'throwable');
+        }
+    }
+
+
+    public function afterExecute()
+    {
+        if ($this->isRecover() !== 999) {
+            return;
+        }
+        $redis = Snowflake::app()->getRedis();
+
+        $name = $this->getName();
+        if (!$redis->exists('stop:crontab:' . $name)) {
+            $redis->set('crontab:' . $name, swoole_serialize($this));
+            $tickTime = time() + $this->getTickTime();
+            $redis->zAdd(Producer::CRONTAB_KEY, $tickTime, $name);
+        } else {
+            $redis->del('crontab:' . $name);
+            $redis->del('stop:crontab:' . $name);
+        }
     }
 
 
@@ -233,30 +265,6 @@ abstract class Crontab extends BaseObject
     }
 
 
-	/**
-	 * @throws Exception
-	 */
-	private function run()
-	{
-		try {
-			$redis = Snowflake::app()->getRedis();
-
-			$name_md5 = $this->getName();
-
-			$redis->hSet(self::WAIT_END, $name_md5, static::getSerialize($this));
-
-			$params = call_user_func([$this, 'process'], ...$this->params);
-			$redis->hDel(self::WAIT_END, $name_md5);
-			if ($params === null) {
-				return;
-			}
-			write(Json::encode(['name' => $this->name, 'response' => serialize($params)]), 'crontab');
-		} catch (\Throwable $throwable) {
-			logger()->addError($throwable, 'throwable');
-		}
-	}
-
-
     /**
      * @return bool
      */