mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-01 23:59:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-07-14 12:12:35 +01:00
commit 2018ad6376
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/scheduler/AsyncWorker.php
View File

@ -38,9 +38,7 @@ class AsyncWorker extends Worker{
public function run(){ public function run(){
$this->registerClassLoader(); $this->registerClassLoader();
if(MainLogger::getLogger() === null){ $this->logger->registerStatic();
$this->logger->registerStatic();
}
gc_enable(); gc_enable();
ini_set("memory_limit", '-1'); ini_set("memory_limit", '-1');

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

@ -54,22 +54,22 @@ class MainLogger extends \AttachableThreadedLogger{
} }
/** /**
* @return MainLogger|null * @return MainLogger
*/ */
public static function getLogger(){ public static function getLogger() : MainLogger{
return static::$logger; return static::$logger;
} }
/** /**
* Assigns the MainLogger instance to the {@link MainLogger#logger} static property. Because static properties are * Assigns the MainLogger instance to the {@link MainLogger#logger} static property.
* thread-local, this must be called from the body of every Thread if you want the logger to be accessible via *
* {@link MainLogger#getLogger}. * WARNING: Because static properties are thread-local, this MUST be called from the body of every Thread if you
* want the logger to be accessible via {@link MainLogger#getLogger}.
*/ */
public function registerStatic(){ public function registerStatic(){
if(static::$logger instanceof MainLogger){ if(static::$logger === null){
throw new \RuntimeException("MainLogger has been already registered"); static::$logger = $this;
} }
static::$logger = $this;
} }
public function emergency($message){ public function emergency($message){

2
tests/plugins/PocketMine-TesterPlugin

@ -1 +1 @@
Subproject commit e09e6e945db84f07050ccadc54463e8beb8e32ba Subproject commit 69608aae7e95f003c9c02b1830705af8e9f82015