mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-15 16:05:28 +00:00
Code Issues Projects Releases Wiki Activity

Scheduler: Catch exceptions thrown from AsyncTask->onCompletion()

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-02-27 11:33:16 +00:00
parent e024f381c9
commit e0d5c79848
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/scheduler/AsyncPool.php
View File

@ -159,8 +159,17 @@ class AsyncPool{
} }
if($task->isGarbage() and !$task->isRunning() and !$task->isCrashed()){ if($task->isGarbage() and !$task->isRunning() and !$task->isCrashed()){
if(!$task->hasCancelledRun()){ if(!$task->hasCancelledRun()){
$task->onCompletion($this->server); try{
$this->server->getScheduler()->removeLocalComplex($task); $task->onCompletion($this->server);
if(!$this->server->getScheduler()->removeLocalComplex($task)){
$this->server->getLogger()->notice("AsyncTask " . get_class($task) . " stored local complex data but did not remove them after completion");
}
}catch(\Throwable $e){
$this->server->getLogger()->critical("Could not execute completion of asychronous task " . (new \ReflectionClass($task))->getShortName() . ": " . $e->getMessage());
$this->server->getLogger()->logException($e);
$this->server->getScheduler()->removeLocalComplex($task); //silent
}
} }
$this->removeTask($task); $this->removeTask($task);

3
src/pocketmine/scheduler/ServerScheduler.php
View File

@ -174,10 +174,11 @@ class ServerScheduler{
*/ */
public function removeLocalComplex(AsyncTask $for) : bool{ public function removeLocalComplex(AsyncTask $for) : bool{
if(isset($this->objectStore[$for])){ if(isset($this->objectStore[$for])){
Server::getInstance()->getLogger()->notice("AsyncTask " . get_class($for) . " stored local complex data but did not remove them after completion");
unset($this->objectStore[$for]); unset($this->objectStore[$for]);
return false; return false;
} }
return true; return true;
} }