修改task finish错误

we7coreteam · Jan 21, 2021 · f79250c · f79250c
1 parent 3873ac2
commit f79250c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Src/Core/Listener/TaskListener.php b/Src/Core/Listener/TaskListener.php
@@ -49,7 +49,7 @@ private function dispatchTask(Server $server, Task $task) {
 				$this->getContainer()->singleton(HandlerExceptions::class)->getHandler()->report($throwable);
 			}
 
-			$task->finish($message->result);
+			$task->finish($message);
 		}
 
 		$this->getEventDispatcher()->dispatch(ServerEvent::ON_USER_AFTER_TASK, [$server, $task]);

diff --git a/Src/Core/Task/TaskDispatcher.php b/Src/Core/Task/TaskDispatcher.php
@@ -160,6 +160,7 @@ protected function dispatchNow($message, $server = null, $taskId = null, $worker
 		try {
 			$message->result = call_user_func_array([$task, $message->method], [$server, $taskId, $workId, $message->params ?? []]);
 		} catch (\Throwable $e) {
+			$message->result = $e->getMessage();
 			$task->fail($e);
 			throw $e;
 		}