mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

Changed how exceptions work and are logged, throw proper exceptions on tasks

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-09-18 12:03:24 +02:00
parent 472fcfa4c7
commit 0bcf639a98
15 changed files with 52 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pocketmine/plugin/PluginManager.php
View File

@ -251,10 +251,7 @@ class PluginManager{
}
}catch(\Throwable $e){
$this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.fileError", [$file, $directory, $e->getMessage()]));
$logger = $this->server->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
}
$this->server->getLogger()->logException($e);
}
}
}
@ -564,10 +561,7 @@ class PluginManager{
}
$plugin->getPluginLoader()->enablePlugin($plugin);
}catch(\Throwable $e){
$logger = Server::getInstance()->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
}
$this->server->getLogger()->logException($e);
$this->disablePlugin($plugin);
}
}
@ -638,10 +632,7 @@ class PluginManager{
try{
$plugin->getPluginLoader()->disablePlugin($plugin);
}catch(\Throwable $e){
$logger = Server::getInstance()->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
}
$this->server->getLogger()->logException($e);
}
$this->server->getScheduler()->cancelTasks($plugin);
@ -682,10 +673,7 @@ class PluginManager{
$e->getMessage(),
get_class($registration->getListener())
]));
$logger = $this->server->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
}
$this->server->getLogger()->logException($e);
}
}
}