From accf5617e29e2a95210f2717ede95cd8a1ddd8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Wed, 1 Jan 2014 19:25:51 +0100 Subject: [PATCH] Moved and Improved Shutdown Command --- application/core/ManiaControl.php | 56 +++++++----- application/core/Server/ServerCommands.php | 99 +++++++++------------- 2 files changed, 77 insertions(+), 78 deletions(-) diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php index b734665f..cdd09744 100644 --- a/application/core/ManiaControl.php +++ b/application/core/ManiaControl.php @@ -122,6 +122,7 @@ class ManiaControl implements CommandListener { // Register for commands $this->commandManager->registerCommandListener('version', $this, 'command_Version'); $this->commandManager->registerCommandListener('restart', $this, 'command_Restart', true); + $this->commandManager->registerCommandListener('shutdown', $this, 'command_Shutdown', true); } /** @@ -190,8 +191,21 @@ class ManiaControl implements CommandListener { $this->authenticationManager->sendNotAllowed($player); return; } - $this->log($player->login . ' requested ManiaControl Restart.'); - $this->restart(); + $this->restart("ManiaControl Restart requested by '{$player->login}'!"); + } + + /** + * Handle //shutdown command + * + * @param array $chat + * @param Player $player + */ + public function command_Shutdown(array $chat, Player $player) { + if (!$this->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) { + $this->authenticationManager->sendNotAllowed($player); + return; + } + $this->quit("ManiaControl Shutdown requested by '{$player->login}'!"); } /** @@ -199,27 +213,26 @@ class ManiaControl implements CommandListener { * * @param string $message */ - public function quit($message = '') { - // Log quit reason - if ($message) { - $this->log($message); - } - + public function quit($message = null) { + if ($message) $this->log($message); + exit(); + } + + /** + * Handle PHP Process Shutdown + */ + public function handleShutdown() { // OnShutdown callback $this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONSHUTDOWN, array(CallbackManager::CB_MC_ONSHUTDOWN)); - if ($this->client) { - // Announce quit - $this->chat->sendInformation('ManiaControl shutting down.'); - - // Hide manialinks - $this->client->query('SendHideManialinkPage'); - } + // Announce quit + $this->chat->sendInformation('ManiaControl shutting down.'); - // Shutdown - if ($this->client) { - $this->client->Terminate(); - } + // Hide manialinks + $this->client->query('SendHideManialinkPage'); + + // Close connection + $this->client->Terminate(); $this->log('Quitting ManiaControl!'); exit(); @@ -236,7 +249,6 @@ class ManiaControl implements CommandListener { // Announce restart $this->chat->sendInformation('Restarting ManiaControl...'); - $this->log('Restarting ManiaControl...'); if ($message) $this->log($message); // Hide widgets @@ -245,6 +257,8 @@ class ManiaControl implements CommandListener { // Close connection $this->client->Terminate(); + $this->log('Restarting ManiaControl!'); + // Execute start script in background if ($this->getOS(self::OS_UNIX)) { $command = 'sh ' . escapeshellarg(ManiaControlDir . '/ManiaControl.sh') . ' > /dev/null &'; @@ -271,7 +285,7 @@ class ManiaControl implements CommandListener { $this->connect(); // Register shutdown handler - register_shutdown_function(array($this, 'quit')); + register_shutdown_function(array($this, 'handleShutdown')); // Loading finished $this->log('Loading completed!'); diff --git a/application/core/Server/ServerCommands.php b/application/core/Server/ServerCommands.php index 78c490d0..67c14756 100644 --- a/application/core/Server/ServerCommands.php +++ b/application/core/Server/ServerCommands.php @@ -25,7 +25,7 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Create a new server commands instance * - * @param ManiaControl $maniaControl + * @param ManiaControl $maniaControl */ public function __construct(ManiaControl $maniaControl) { $this->maniaControl = $maniaControl; @@ -34,26 +34,25 @@ class ServerCommands implements CallbackListener, CommandListener { $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_5_SECOND, $this, 'each5Seconds'); // Register for commands - $this->maniaControl->commandManager->registerCommandListener('setpwd', $this, 'command_SetPwd',true); - $this->maniaControl->commandManager->registerCommandListener('setservername', $this, 'command_SetServerName',true); - $this->maniaControl->commandManager->registerCommandListener('setmaxplayers', $this, 'command_SetMaxPlayers',true); - $this->maniaControl->commandManager->registerCommandListener('setmaxspectators', $this, 'command_SetMaxSpectators',true); - $this->maniaControl->commandManager->registerCommandListener('setspecpwd', $this, 'command_SetSpecPwd',true); - $this->maniaControl->commandManager->registerCommandListener('shutdown', $this, 'command_Shutdown',true); - $this->maniaControl->commandManager->registerCommandListener('shutdownserver', $this, 'command_ShutdownServer',true); - $this->maniaControl->commandManager->registerCommandListener('systeminfo', $this, 'command_SystemInfo',true); - $this->maniaControl->commandManager->registerCommandListener('hideserver', $this, 'command_HideServer',true); - $this->maniaControl->commandManager->registerCommandListener('showserver', $this, 'command_ShowServer',true); - $this->maniaControl->commandManager->registerCommandListener('enablemapdownload', $this, 'command_EnableMapDownload',true); - $this->maniaControl->commandManager->registerCommandListener('disablemapdownload', $this, 'command_DisableMapDownload',true); - $this->maniaControl->commandManager->registerCommandListener('enablehorns', $this, 'command_EnableHorns',true); - $this->maniaControl->commandManager->registerCommandListener('disablehorns', $this, 'command_DisableHorns',true); + $this->maniaControl->commandManager->registerCommandListener('setpwd', $this, 'command_SetPwd', true); + $this->maniaControl->commandManager->registerCommandListener('setservername', $this, 'command_SetServerName', true); + $this->maniaControl->commandManager->registerCommandListener('setmaxplayers', $this, 'command_SetMaxPlayers', true); + $this->maniaControl->commandManager->registerCommandListener('setmaxspectators', $this, 'command_SetMaxSpectators', true); + $this->maniaControl->commandManager->registerCommandListener('setspecpwd', $this, 'command_SetSpecPwd', true); + $this->maniaControl->commandManager->registerCommandListener('shutdownserver', $this, 'command_ShutdownServer', true); + $this->maniaControl->commandManager->registerCommandListener('systeminfo', $this, 'command_SystemInfo', true); + $this->maniaControl->commandManager->registerCommandListener('hideserver', $this, 'command_HideServer', true); + $this->maniaControl->commandManager->registerCommandListener('showserver', $this, 'command_ShowServer', true); + $this->maniaControl->commandManager->registerCommandListener('enablemapdownload', $this, 'command_EnableMapDownload', true); + $this->maniaControl->commandManager->registerCommandListener('disablemapdownload', $this, 'command_DisableMapDownload', true); + $this->maniaControl->commandManager->registerCommandListener('enablehorns', $this, 'command_EnableHorns', true); + $this->maniaControl->commandManager->registerCommandListener('disablehorns', $this, 'command_DisableHorns', true); } /** * Check stuff each 5 seconds * - * @param array $callback + * @param array $callback * @return bool */ public function each5Seconds(array $callback) { @@ -76,8 +75,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //systeminfo command * - * @param array $chat - * @param Player $player + * @param array $chat + * @param Player $player */ public function command_SystemInfo(array $chat, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) { @@ -90,25 +89,11 @@ class ServerCommands implements CallbackListener, CommandListener { $this->maniaControl->chat->sendInformation($message, $player->login); } - /** - * Handle //shutdown command - * - * @param array $chat - * @param Player $player - */ - public function command_Shutdown(array $chat, Player $player) { - if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) { - $this->maniaControl->authenticationManager->sendNotAllowed($player); - return; - } - $this->maniaControl->quit("ManiaControl shutdown requested by '{$player->login}'"); - } - /** * Handle //shutdownserver command * - * @param array $chat - * @param Player $player + * @param array $chat + * @param Player $player */ public function command_ShutdownServer(array $chat, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) { @@ -146,8 +131,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //setservername command * - * @param array $chat - * @param Player $player + * @param array $chat + * @param Player $player */ public function command_SetServerName(array $chat, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_ADMIN)) { @@ -170,8 +155,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //setpwd command * - * @param array $chatCallback - * @param Player $player + * @param array $chatCallback + * @param Player $player */ public function command_SetPwd(array $chatCallback, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_ADMIN)) { @@ -196,8 +181,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //setspecpwd command * - * @param array $chatCallback - * @param Player $player + * @param array $chatCallback + * @param Player $player */ public function command_SetSpecPwd(array $chatCallback, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_ADMIN)) { @@ -222,8 +207,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //setmaxplayers command * - * @param array $chatCallback - * @param Player $player + * @param array $chatCallback + * @param Player $player */ public function command_SetMaxPlayers(array $chatCallback, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_ADMIN)) { @@ -255,8 +240,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //setmaxspectators command * - * @param array $chatCallback - * @param Player $player + * @param array $chatCallback + * @param Player $player */ public function command_SetMaxSpectators(array $chatCallback, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_ADMIN)) { @@ -288,8 +273,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //hideserver command * - * @param array $chatCallback - * @param Player $player + * @param array $chatCallback + * @param Player $player */ public function command_HideServer(array $chatCallback, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_ADMIN)) { @@ -307,8 +292,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //showserver command * - * @param array $chatCallback - * @param Player $player + * @param array $chatCallback + * @param Player $player */ public function command_ShowServer(array $chatCallback, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_ADMIN)) { @@ -326,8 +311,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //enablemapdownload command * - * @param array $chatCallback - * @param Player $player + * @param array $chatCallback + * @param Player $player */ public function command_EnableMapDownload(array $chatCallback, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_ADMIN)) { @@ -345,8 +330,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //disablemapdownload command * - * @param array $chatCallback - * @param Player $player + * @param array $chatCallback + * @param Player $player */ public function command_DisableMapDownload(array $chatCallback, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_ADMIN)) { @@ -364,8 +349,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //enablehorns command * - * @param array $chatCallback - * @param Player $player + * @param array $chatCallback + * @param Player $player */ public function command_EnableHorns(array $chatCallback, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) { @@ -383,8 +368,8 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Handle //disablehorns command * - * @param array $chatCallback - * @param Player $player + * @param array $chatCallback + * @param Player $player */ public function command_DisableHorns(array $chatCallback, Player $player) { if (!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) { @@ -402,7 +387,7 @@ class ServerCommands implements CallbackListener, CommandListener { /** * Perform server shutdown * - * @param string $login + * @param string $login * @return bool */ private function shutdownServer($login = '#') {