From fdfbaf4e95d9760199b363005cca71b852d5eee5 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 25 Aug 2019 16:34:26 +0100 Subject: [PATCH] make startup performance warnings a little more coherent --- src/PocketMine.php | 20 +++++++++++++------- src/Server.php | 4 ---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/PocketMine.php b/src/PocketMine.php index eaa0def36..b8d5a7773 100644 --- a/src/PocketMine.php +++ b/src/PocketMine.php @@ -122,6 +122,18 @@ namespace pocketmine { return $messages; } + function emit_performance_warnings(\Logger $logger){ + if(extension_loaded("xdebug")){ + $logger->warning("Xdebug extension is enabled. This has a major impact on performance."); + } + if(((int) ini_get('zend.assertions')) !== -1){ + $logger->warning("Debugging assertions are enabled. This may degrade performance. To disable them, set `zend.assertions = -1` in php.ini."); + } + if(\Phar::running(true) === ""){ + $logger->warning("Non-packaged installation detected. This will degrade autoloading speed and make startup times longer."); + } + } + function server(){ if(!empty($messages = check_platform_dependencies())){ echo PHP_EOL; @@ -219,13 +231,7 @@ namespace pocketmine { $logger = new MainLogger(\pocketmine\DATA . "server.log"); \GlobalLogger::set($logger); - if(extension_loaded("xdebug")){ - $logger->warning(PHP_EOL . PHP_EOL . PHP_EOL . "\tYou are running " . \pocketmine\NAME . " with xdebug enabled. This has a major impact on performance." . PHP_EOL . PHP_EOL); - } - - if(\Phar::running(true) === ""){ - $logger->warning("Non-packaged " . \pocketmine\NAME . " installation detected. Consider using a phar in production for better performance."); - } + emit_performance_warnings($logger); $version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER); define('pocketmine\VERSION', $version->getFullVersion(true)); diff --git a/src/Server.php b/src/Server.php index edeed2f7d..621cf9510 100644 --- a/src/Server.php +++ b/src/Server.php @@ -1070,10 +1070,6 @@ class Server{ $this->logger->warning(str_repeat("-", 40)); } - if(((int) ini_get('zend.assertions')) !== -1){ - $this->logger->warning("Debugging assertions are enabled, this may impact on performance. To disable them, set `zend.assertions = -1` in php.ini."); - } - ini_set('assert.exception', '1'); if($this->logger instanceof MainLogger){