mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into api3/network

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-03-25 21:26:46 +00:00
parent 6a03f8d434 b9dfc7551a
commit 4245274aec
20 changed files with 128 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/utils/MainLogger.php
View File

@ -134,12 +134,10 @@ class MainLogger extends \AttachableThreadedLogger{
$type = ($errno === E_ERROR or $errno === E_USER_ERROR) ? LogLevel::ERROR : (($errno === E_USER_WARNING or $errno === E_WARNING) ? LogLevel::WARNING : LogLevel::NOTICE);
}
$errno = $errorConversion[$errno] ?? $errno;
if(($pos = strpos($errstr, "\n")) !== false){
$errstr = substr($errstr, 0, $pos);
}
$errstr = preg_replace('/\s+/', ' ', trim($errstr));
$errfile = \pocketmine\cleanPath($errfile);
$this->log($type, get_class($e) . ": \"$errstr\" ($errno) in \"$errfile\" at line $errline");
foreach(@\pocketmine\getTrace(1, $trace) as $i => $line){
foreach(\pocketmine\getTrace(0, $trace) as $i => $line){
$this->debug($line);
}
}