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

28
src/pocketmine/Server.php
View File

@ -818,9 +818,7 @@ class Server{
}
}catch(\Throwable $e){
$this->logger->critical($this->getLanguage()->translateString("pocketmine.data.saveError", [$name, $e->getMessage()]));
if(\pocketmine\DEBUG > 1 and $this->logger instanceof MainLogger){
$this->logger->logException($e);
}
$this->logger->logException($e);
}
}
@ -1028,9 +1026,7 @@ class Server{
}catch(\Throwable $e){
$this->logger->error($this->getLanguage()->translateString("pocketmine.level.loadError", [$name, $e->getMessage()]));
if($this->logger instanceof MainLogger){
$this->logger->logException($e);
}
$this->logger->logException($e);
return false;
}
@ -1087,9 +1083,7 @@ class Server{
$level->setTickRate($this->baseTickRate);
}catch(\Throwable $e){
$this->logger->error($this->getLanguage()->translateString("pocketmine.level.generateError", [$name, $e->getMessage()]));
if($this->logger instanceof MainLogger){
$this->logger->logException($e);
}
$this->logger->logException($e);
return false;
}
@ -2068,9 +2062,7 @@ class Server{
$errfile = cleanPath($errfile);
if($this->logger instanceof MainLogger){
$this->logger->logException($e, $trace);
}
$this->logger->logException($e, $trace);
$lastError = [
"type" => $type,
@ -2281,9 +2273,7 @@ class Server{
}
}catch(\Throwable $e){
$this->logger->critical($this->getLanguage()->translateString("pocketmine.level.tickError", [$level->getName(), $e->getMessage()]));
if(\pocketmine\DEBUG > 1 and $this->logger instanceof MainLogger){
$this->logger->logException($e);
}
$this->logger->logException($e);
}
}
}
@ -2376,9 +2366,7 @@ class Server{
}
}catch(\Throwable $e){
if(\pocketmine\DEBUG > 1){
if($this->logger instanceof MainLogger){
$this->logger->logException($e);
}
$this->logger->logException($e);
}
$this->getNetwork()->blockAddress($address, 600);
@ -2433,9 +2421,7 @@ class Server{
$this->queryHandler->regenerateInfo();
}
}catch(\Throwable $e){
if($this->logger instanceof MainLogger){
$this->logger->logException($e);
}
$this->logger->logException($e);
}
}