Merge pull request #229 from swooletw/master

From master to develop
swooletw · Mar 3, 2019 · 9a06fd2 · 9a06fd2
2 parents 8fa56e6 + e0b9167
commit 9a06fd2
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Server/Manager.php b/src/Server/Manager.php
@@ -256,13 +256,19 @@ protected function resetOnRequest()
      * Set onTask listener.
      *
      * @param mixed $server
-     * @param string $taskId
-     * @param string $srcWorkerId
-     * @param mixed $data
+     * @param string|\Swoole\Server\Task $taskIdOrTask
+     * @param string $srcWorkerId                       Optional
+     * @param mixed $data                               Optional
      */
-    public function onTask($server, $taskId, $srcWorkerId, $data)
+    public function onTask($server, ...$args)
     {
-        $this->container->make('events')->fire('swoole.task', func_get_args());
+        if ($args[0] instanceof \Swoole\Server\Task && $task = array_shift($args)) {
+            list($taskId, $srcWorkerId, $data) = [$task->id, $task->worker_id, $task->data];
+        } else {
+            list($taskId, $srcWorkerId, $data) = $args;
+        }
+
+        $this->container->make('events')->fire('swoole.task', [$server, $taskId, $srcWorkerId, $data]);
 
         try {
             // push websocket message