From 8c363cb5719165a78a1fd683c62eb6394a46a23e Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 9 Sep 2017 18:44:18 +0100 Subject: [PATCH 1/3] Added capability to specify arguments to PocketMine.php when running start.ps1 Example: .\start.ps1 --disable-ansi --debug.level=2 --- start.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/start.ps1 b/start.ps1 index ef3c1221f..9c0cf318f 100644 --- a/start.ps1 +++ b/start.ps1 @@ -1,6 +1,8 @@ -param ( +[CmdletBinding(PositionalBinding=$false)] +param ( [string]$php = "", - [switch]$Loop = $false + [switch]$Loop = $false, + [string][Parameter(ValueFromRemainingArguments)]$extraPocketMineArgs ) if($php -ne ""){ @@ -23,7 +25,7 @@ if(Test-Path "PocketMine-MP.phar"){ } function StartServer{ - $command = "powershell " + $binary + " " + $file + " --enable-ansi" + $command = "powershell " + $binary + " " + $file + " --enable-ansi " + $extraPocketMineArgs iex $command } From 8761256246ba12129e0526c0057ed9323d177cd4 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 9 Sep 2017 19:21:32 +0100 Subject: [PATCH 2/3] Be more clear about WHY not to use source installs in production --- src/pocketmine/PocketMine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index b039ef2d4..f5b173446 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -534,7 +534,7 @@ namespace pocketmine { if(\Phar::running(true) === ""){ - $logger->warning("Non-packaged PocketMine-MP installation detected, do not use on production."); + $logger->warning("Non-packaged PocketMine-MP installation detected. Consider using a phar in production for better performance."); } ThreadManager::init(); From 7f5d8cc900a8e10ec87facf77b823fa51f500e14 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 9 Sep 2017 19:27:26 +0100 Subject: [PATCH 3/3] Always log stack traces regardless of whether log-debug is enabled --- src/pocketmine/utils/MainLogger.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pocketmine/utils/MainLogger.php b/src/pocketmine/utils/MainLogger.php index 686f68344..8e97d6104 100644 --- a/src/pocketmine/utils/MainLogger.php +++ b/src/pocketmine/utils/MainLogger.php @@ -105,8 +105,8 @@ class MainLogger extends \AttachableThreadedLogger{ $this->send($message, \LogLevel::INFO, "INFO", TextFormat::WHITE); } - public function debug($message){ - if($this->logDebug === false){ + public function debug($message, bool $force = false){ + if($this->logDebug === false and !$force){ return; } $this->send($message, \LogLevel::DEBUG, "DEBUG", TextFormat::GRAY); @@ -156,7 +156,7 @@ class MainLogger extends \AttachableThreadedLogger{ $errfile = \pocketmine\cleanPath($errfile); $this->log($type, get_class($e) . ": \"$errstr\" ($errno) in \"$errfile\" at line $errline"); foreach(\pocketmine\getTrace(0, $trace) as $i => $line){ - $this->debug($line); + $this->debug($line, true); } }