Merge pull request #483 from memfork/fix-could-not-working-task-when-…

…enabling-task_enable_coroutine fix could not working onTask when enabling task_enable_coroutine on swoole_http.php
swooletw · Apr 22, 2021 · ebc5859 · ebc5859
2 parents f94b69f + c89542d
commit ebc5859
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Server/Manager.php b/src/Server/Manager.php
@@ -260,11 +260,19 @@ protected function resetOnRequest()
      *
      * @param mixed $server
      * @param string|\Swoole\Server\Task $taskId or $task
-     * @param string $srcWorkerId
-     * @param mixed $data
+     * @param string|null $srcWorkerId
+     * @param mixed|null $data
      */
-    public function onTask($server, $taskId, $srcWorkerId, $data)
+    public function onTask($server, $task, $srcWorkerId = null, $data = null)
     {
+        if ($task instanceof Task) {
+            $data = $task->data;
+            $srcWorkerId = $task->worker_id;
+            $taskId = $task->id;
+        } else {
+            $taskId = $task;
+        }
+
         $this->container->make('events')->dispatch('swoole.task', func_get_args());
 
         try {