fixed: 异常处理afterHandle调用处理

bingcool · Apr 13, 2023 · 6c378d4 · 6c378d4
1 parent 90d4b17
commit 6c378d4
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/src/Core/Crontab/AbstractCronController.php b/src/Core/Crontab/AbstractCronController.php
@@ -64,6 +64,7 @@ public function runCron(string $cronName, string $expression, ?callable $func =
                     call_user_func($func, $cronName, $expression);
                 } else {
                     $this->doCronTask($cron, $cronName);
+                    $this->afterHandle();
                 }
 
                 if (!$this->isDefer()) {

diff --git a/src/Core/EventController.php b/src/Core/EventController.php
@@ -12,7 +12,6 @@
 namespace Swoolefy\Core;
 
 use Swoolefy\Core\Coroutine\CoroutineManager;
-use Swoolefy\Exception\SystemException;
 
 /**
  * Class EventController
@@ -188,6 +187,17 @@ public function isDefer()
         return $this->isDefer;
     }
 
+    /**
+     * afterHandle
+     */
+    public function afterHandle()
+    {
+        // call after action
+        $this->_afterAction();
+        // callHooks
+        $this->callAfterEventHook();
+    }
+
     /**
      * end unset var
      * @return bool|void
@@ -199,10 +209,6 @@ public function end()
         }
         // set End
         $this->setEnd();
-        // call hook callable
-        static::_afterAction();
-        // callHooks
-        $this->callAfterEventHook();
         // handle log
         $this->handleLog();
         // remove

diff --git a/src/Core/ServiceDispatch.php b/src/Core/ServiceDispatch.php
@@ -85,6 +85,9 @@ public function dispatch()
                 $serviceInstance->{$action}($this->params);
                 // after Call
                 $serviceInstance->_afterAction($action);
+                // call hook callable
+                Hook::callHook(Hook::HOOK_AFTER_REQUEST);
+
             } else {
                 $this->errorHandle($class, $action, 'error500');
                 return false;

diff --git a/src/Core/Swoole.php b/src/Core/Swoole.php
@@ -102,8 +102,8 @@ public function bootstrap(mixed $payload)
 
     /**
      * run instance
-     * @param int $fd
-     * @param mixed $input
+     * @param int|null $fd
+     * @param mixed $payload
      * @param array $extendData
      * @return void
      */
@@ -283,8 +283,6 @@ protected function defer()
      */
     public function end()
     {
-        // call hook callable
-        Hook::callHook(Hook::HOOK_AFTER_REQUEST);
         // log handle
         $this->handleLog();
         // remove

diff --git a/src/Core/Timer/Tick.php b/src/Core/Timer/Tick.php
@@ -74,6 +74,8 @@ protected static function tick(int $timeIntervalMs, \Closure|array $func, array
                     $tickTaskInstance = new TickController();
                     call_user_func($func, $params, $timerId);
                 }
+                // call after action
+                $tickTaskInstance->afterHandle();
             } catch (\Throwable $throwable) {
                 BaseServer::catchException($throwable);
             } finally {
@@ -181,6 +183,8 @@ protected static function after(int $timeIntervalMs, \Closure|array $func, array
                     $tickTaskInstance = new TickController;
                     call_user_func($func, $params, $timer_id);
                 }
+                // call after action
+                $tickTaskInstance->afterHandle();
             } catch (\Throwable $throwable) {
                 BaseServer::catchException($throwable);
             } finally {

diff --git a/src/Http/HttpAppServer.php b/src/Http/HttpAppServer.php
@@ -87,11 +87,14 @@ public function onTask($server, $task_id, $from_worker_id, $data, $task = null)
             $taskInstance->setFromWorkerId((int)$from_worker_id);
             $task && $taskInstance->setTask($task);
             $taskInstance->$action($taskData);
+            $taskInstance->afterHandle();
 
             unset($callable, $extendData, $fd);
 
         } catch (\Throwable $throwable) {
-            $taskInstance->end();
+            if(!$taskInstance->isDefer()) {
+                $taskInstance->end();
+            }
             throw $throwable;
         }
     }