beu/TrackManiaControl
1
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

replaced ManiaControl log method by direct Logger usage

Browse Source
This commit is contained in:
Steffen Schröder
2014-08-05 01:49:13 +02:00
parent b62d6af929
commit a6b0d749bc
22 changed files with 111 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
application/core/Update/PluginUpdateManager.php
View File

@ -72,7 +72,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendInformation($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
$this->maniaControl->getPluginManager()->fetchPluginList(function ($data, $error) use (&$player) {
if (!$data || $error) {
@ -80,7 +80,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendError($message, $player);
}
$this->maniaControl->log($message);
Logger::logError($message);
return;
}
@ -103,7 +103,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendSuccess($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
}
}
@ -112,14 +112,14 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendSuccess($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
} else {
$updatesCount = count($pluginUpdates);
$message = "Plugins Update Check completed: There are {$updatesCount} Updates available!";
if ($player) {
$this->maniaControl->getChat()->sendSuccess($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
}
});
}
@ -169,7 +169,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendInformation($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
return;
}
@ -177,7 +177,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendInformation($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
$performBackup = $this->maniaControl->getSettingManager()->getSettingValue($this->maniaControl->getUpdateManager(), UpdateManager::SETTING_PERFORM_BACKUPS);
if ($performBackup && !BackupUtil::performPluginsBackup()) {
@ -185,7 +185,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendError($message, $player);
}
$this->maniaControl->log($message);
Logger::logError($message);
}
foreach ($pluginsUpdates as $pluginUpdateData) {
@ -246,7 +246,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendInformation($message, $player);
}
$this->maniaControl->log($message);
Logger::logError($message);
return;
}
@ -258,7 +258,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendInformation($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
$tempDir = FileUtil::getTempFolder();
$updateFileName = $tempDir . $pluginUpdateData->zipfile;
@ -297,7 +297,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendSuccess($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
if (!$update) {
$newPluginClasses = $this->maniaControl->getPluginManager()->loadPlugins();
@ -306,13 +306,13 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($player) {
$this->maniaControl->getChat()->sendError($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
} else {
$message = "Successfully loaded fresh installed Plugin '{$pluginUpdateData->pluginName}'!";
if ($player) {
$this->maniaControl->getChat()->sendSuccess($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
$this->maniaControl->getConfigurator()->showMenu($player, InstallMenu::getTitle());
}

27
application/core/Update/UpdateManager.php
View File

@ -8,6 +8,7 @@ use ManiaControl\Callbacks\TimerListener;
use ManiaControl\Commands\CommandListener;
use ManiaControl\Files\BackupUtil;
use ManiaControl\Files\FileUtil;
use ManiaControl\Logger;
use ManiaControl\ManiaControl;
use ManiaControl\Players\Player;
use ManiaControl\Players\PlayerManager;
@ -141,7 +142,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
$this->maniaControl->getFileReader()->loadFile($url, function ($dataJson, $error) use (&$function) {
if ($error) {
$this->maniaControl->log('Error on UpdateCheck: ' . $error);
Logger::logError('Error on UpdateCheck: ' . $error);
return;
}
$versions = json_decode($dataJson);
@ -180,15 +181,15 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
}
if (!$this->checkUpdateDataBuildVersion($updateData)) {
// Server incompatible
$this->maniaControl->log("Please update Your Server to '{$updateData->minDedicatedBuild}' in order to receive further Updates!");
Logger::logError("Please update Your Server to '{$updateData->minDedicatedBuild}' in order to receive further Updates!");
return;
}
if ($this->coreUpdateData != $updateData) {
if ($this->isNightlyUpdateChannel()) {
$this->maniaControl->log("New Nightly Build ({$updateData->releaseDate}) available!");
Logger::log("New Nightly Build ({$updateData->releaseDate}) available!");
} else {
$this->maniaControl->log("New ManiaControl Version {$updateData->version} available!");
Logger::log("New ManiaControl Version {$updateData->version} available!");
}
$this->setCoreUpdateData($updateData);
}
@ -300,11 +301,11 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
if ($player) {
$this->maniaControl->getChat()->sendError($message, $player);
}
$this->maniaControl->log($message);
Logger::logError($message);
return false;
}
$this->maniaControl->log("Starting Update to Version v{$this->coreUpdateData->version}...");
Logger::log("Starting Update to Version v{$this->coreUpdateData->version}...");
$directories = array('core', 'plugins');
if (!FileUtil::checkWritePermissions($directories)) {
@ -312,7 +313,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
if ($player) {
$this->maniaControl->getChat()->sendError($message, $player);
}
$this->maniaControl->log($message);
Logger::logError($message);
return false;
}
@ -322,7 +323,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
if ($player) {
$this->maniaControl->getChat()->sendError($message, $player);
}
$this->maniaControl->log($message);
Logger::logError($message);
}
$updateData = $this->coreUpdateData;
@ -334,7 +335,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
if ($player) {
$this->maniaControl->getChat()->sendError($message, $player);
}
$this->maniaControl->log($message);
Logger::logError($message);
return;
}
@ -344,7 +345,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
if ($player) {
$this->maniaControl->getChat()->sendError($message, $player);
}
$this->maniaControl->log($message);
Logger::logError($message);
return;
}
$updateFileName = $tempDir . basename($updateData->url);
@ -355,7 +356,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
if ($player) {
$this->maniaControl->getChat()->sendError($message, $player);
}
$this->maniaControl->log($message);
Logger::logError($message);
return;
}
@ -366,7 +367,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
if ($player) {
$this->maniaControl->getChat()->sendError($message, $player);
}
$this->maniaControl->log($message);
Logger::logError($message);
unlink($updateFileName);
return;
}
@ -383,7 +384,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
if ($player) {
$this->maniaControl->getChat()->sendSuccess($message, $player);
}
$this->maniaControl->log($message);
Logger::log($message);
$this->maniaControl->restart();
});