mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 01:39:52 +00:00
Code Issues Projects Releases Wiki Activity

AutoUpdater: add a prefixed logger

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-06-04 13:51:17 +01:00
parent e69ab60034
commit 6743234461
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/updater/AutoUpdater.php
View File

@ -46,12 +46,16 @@ class AutoUpdater{
/** @var VersionString|null */ /** @var VersionString|null */
protected $newVersion; protected $newVersion;
/** @var \Logger */
private $logger;
/** /**
* @param Server $server * @param Server $server
* @param string $endpoint * @param string $endpoint
*/ */
public function __construct(Server $server, string $endpoint){ public function __construct(Server $server, string $endpoint){
$this->server = $server; $this->server = $server;
$this->logger = new \PrefixedLogger($server->getLogger(), "Auto Updater");
$this->endpoint = "http://$endpoint/api/"; $this->endpoint = "http://$endpoint/api/";
if($server->getProperty("auto-updater.enabled", true)){ if($server->getProperty("auto-updater.enabled", true)){
@ -60,7 +64,7 @@ class AutoUpdater{
} }
public function checkUpdateError(string $error) : void{ public function checkUpdateError(string $error) : void{
$this->server->getLogger()->debug("[AutoUpdater] Async update check failed due to \"$error\""); $this->logger->debug("Async update check failed due to \"$error\"");
} }
/** /**
@ -134,14 +138,12 @@ class AutoUpdater{
} }
protected function printConsoleMessage(array $lines, string $logLevel = \LogLevel::INFO) : void{ protected function printConsoleMessage(array $lines, string $logLevel = \LogLevel::INFO) : void{
$logger = $this->server->getLogger();
$title = $this->server->getName() . ' Auto Updater'; $title = $this->server->getName() . ' Auto Updater';
$logger->log($logLevel, sprintf('----- %s -----', $title)); $this->logger->log($logLevel, sprintf('----- %s -----', $title));
foreach($lines as $line){ foreach($lines as $line){
$logger->log($logLevel, $line); $this->logger->log($logLevel, $line);
} }
$logger->log($logLevel, sprintf('----- %s -----', str_repeat('-', strlen($title)))); $this->logger->log($logLevel, sprintf('----- %s -----', str_repeat('-', strlen($title))));
} }
/** /**
@ -172,7 +174,7 @@ class AutoUpdater{
$newVersion = new VersionString($this->updateInfo["base_version"], $this->updateInfo["is_dev"], $this->updateInfo["build"]); $newVersion = new VersionString($this->updateInfo["base_version"], $this->updateInfo["is_dev"], $this->updateInfo["build"]);
}catch(\InvalidArgumentException $e){ }catch(\InvalidArgumentException $e){
//Invalid version returned from API, assume there's no update //Invalid version returned from API, assume there's no update
$this->server->getLogger()->debug("[AutoUpdater] Assuming no update because \"" . $e->getMessage() . "\""); $this->logger->debug("Assuming no update because \"" . $e->getMessage() . "\"");
return; return;
} }