mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 23:29:54 +00:00
Code Issues Projects Releases Wiki Activity

Utils: Make kill() use static MainLogger instead of global variable

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-06-07 09:29:53 +01:00
parent 5f7c884255
commit 73e56c8a36
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,14 @@ class MainLogger extends \AttachableThreadedLogger{
return static::$logger; return static::$logger;
} }
/**
* Returns whether a MainLogger instance is statically registered on this thread.
* @return bool
*/
public static function isRegisteredStatic() : bool{
return static::$logger !== null;
}
/** /**
* Assigns the MainLogger instance to the {@link MainLogger#logger} static property. * Assigns the MainLogger instance to the {@link MainLogger#logger} static property.
* *

5
src/pocketmine/utils/Utils.php
View File

@ -545,9 +545,8 @@ class Utils{
} }
public static function kill($pid) : void{ public static function kill($pid) : void{
global $logger; if(MainLogger::isRegisteredStatic()){
if($logger instanceof MainLogger){ MainLogger::getLogger()->syncFlushBuffer();
$logger->syncFlushBuffer();
} }
switch(Utils::getOS()){ switch(Utils::getOS()){
case "win": case "win":