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

terminate client, moved loading to other position

Browse Source
This commit is contained in:
kremsy 2014-01-10 13:08:26 +01:00
parent c28cb01f9e
commit 26d2173fa2
1 changed files with 114 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
application/core/ManiaControl.php
View File

@ -42,10 +42,9 @@ require_once __DIR__ . '/Server/Server.php';
require_once __DIR__ . '/Settings/SettingManager.php'; require_once __DIR__ . '/Settings/SettingManager.php';
require_once __DIR__ . '/UpdateManager.php'; require_once __DIR__ . '/UpdateManager.php';
list($endiantest) = array_values(unpack('L1L', pack('V', 1))); list($endiantest) = array_values(unpack('L1L', pack('V', 1)));
if ($endiantest == 1) { if($endiantest == 1) {
require_once __DIR__ . '/PhpRemote/GbxRemote.inc.php'; require_once __DIR__ . '/PhpRemote/GbxRemote.inc.php';
} } else {
else {
require_once __DIR__ . '/PhpRemote/GbxRemote.bem.php'; require_once __DIR__ . '/PhpRemote/GbxRemote.bem.php';
} }
@ -131,7 +130,7 @@ class ManiaControl implements CommandListener {
* @param string $message * @param string $message
*/ */
public function log($message, $stripCodes = false) { public function log($message, $stripCodes = false) {
if ($stripCodes) { if($stripCodes) {
$message = Formatter::stripCodes($message); $message = Formatter::stripCodes($message);
} }
logMessage($message); logMessage($message);
@ -145,15 +144,15 @@ class ManiaControl implements CommandListener {
*/ */
public function getOS($compareOS = null) { public function getOS($compareOS = null) {
$windows = defined('PHP_WINDOWS_VERSION_MAJOR'); $windows = defined('PHP_WINDOWS_VERSION_MAJOR');
if ($compareOS) { if($compareOS) {
// Return bool whether OS equals $compareOS // Return bool whether OS equals $compareOS
if ($compareOS == self::OS_WIN) { if($compareOS == self::OS_WIN) {
return $windows; return $windows;
} }
return !$windows; return !$windows;
} }
// Return OS // Return OS
if ($windows) { if($windows) {
return self::OS_WIN; return self::OS_WIN;
} }
return self::OS_UNIX; return self::OS_UNIX;
@ -166,7 +165,7 @@ class ManiaControl implements CommandListener {
* @return string * @return string
*/ */
public function getClientErrorText($client = null) { public function getClientErrorText($client = null) {
if (is_object($client)) { if(is_object($client)) {
return $client->getErrorMessage() . ' (' . $client->getErrorCode() . ')'; return $client->getErrorMessage() . ' (' . $client->getErrorCode() . ')';
} }
return $this->client->getErrorMessage() . ' (' . $this->client->getErrorCode() . ')'; return $this->client->getErrorMessage() . ' (' . $this->client->getErrorCode() . ')';
@ -190,7 +189,7 @@ class ManiaControl implements CommandListener {
* @param Player $player * @param Player $player
*/ */
public function command_Restart(array $chatCallback, Player $player) { public function command_Restart(array $chatCallback, Player $player) {
if (!AuthenticationManager::checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) { if(!AuthenticationManager::checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) {
$this->authenticationManager->sendNotAllowed($player); $this->authenticationManager->sendNotAllowed($player);
return; return;
} }
@ -204,7 +203,7 @@ class ManiaControl implements CommandListener {
* @param Player $player * @param Player $player
*/ */
public function command_Shutdown(array $chat, Player $player) { public function command_Shutdown(array $chat, Player $player) {
if (!$this->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) { if(!$this->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) {
$this->authenticationManager->sendNotAllowed($player); $this->authenticationManager->sendNotAllowed($player);
return; return;
} }
@ -217,7 +216,9 @@ class ManiaControl implements CommandListener {
* @param string $message * @param string $message
*/ */
public function quit($message = null) { public function quit($message = null) {
if ($message) $this->log($message); if($message) {
$this->log($message);
}
exit(); exit();
} }
@ -252,7 +253,9 @@ class ManiaControl implements CommandListener {
// Announce restart // Announce restart
$this->chat->sendInformation('Restarting ManiaControl...'); $this->chat->sendInformation('Restarting ManiaControl...');
if ($message) $this->log($message); if($message) {
$this->log($message);
}
// Hide widgets // Hide widgets
$this->client->query('SendHideManialinkPage'); $this->client->query('SendHideManialinkPage');
@ -263,11 +266,10 @@ class ManiaControl implements CommandListener {
$this->log('Restarting ManiaControl!'); $this->log('Restarting ManiaControl!');
// Execute start script in background // Execute start script in background
if ($this->getOS(self::OS_UNIX)) { if($this->getOS(self::OS_UNIX)) {
$command = 'sh ' . escapeshellarg(ManiaControlDir . '/ManiaControl.sh') . ' > /dev/null &'; $command = 'sh ' . escapeshellarg(ManiaControlDir . '/ManiaControl.sh') . ' > /dev/null &';
exec($command); exec($command);
} } else {
else {
// TODO: validate restart on windows // TODO: validate restart on windows
$command = 'start /B ' . escapeshellarg(ManiaControlDir . '/ManiaControl.bat'); $command = 'start /B ' . escapeshellarg(ManiaControlDir . '/ManiaControl.bat');
pclose(popen($command, 'r')); pclose(popen($command, 'r'));
@ -291,17 +293,17 @@ class ManiaControl implements CommandListener {
// Register shutdown handler // Register shutdown handler
register_shutdown_function(array($this, 'handleShutdown')); register_shutdown_function(array($this, 'handleShutdown'));
// Loading finished // OnInit callback
$this->log('Loading completed!'); $this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONINIT, array(CallbackManager::CB_MC_ONINIT));
// Announce ManiaControl // Announce ManiaControl
$this->chat->sendInformation('ManiaControl v' . self::VERSION . ' successfully started!'); $this->chat->sendInformation('ManiaControl v' . self::VERSION . ' successfully started!');
// OnInit callback // Loading finished
$this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONINIT, array(CallbackManager::CB_MC_ONINIT)); $this->log('Loading completed!');
// Main loop // Main loop
while (!$this->shutdownRequested) { while(!$this->shutdownRequested) {
$loopStart = microtime(true); $loopStart = microtime(true);
// Disable script timeout // Disable script timeout
@ -313,11 +315,14 @@ class ManiaControl implements CommandListener {
// Yield for next tick // Yield for next tick
$loopEnd = microtime(true); $loopEnd = microtime(true);
$sleepTime = 300000 - $loopEnd + $loopStart; $sleepTime = 300000 - $loopEnd + $loopStart;
if ($sleepTime > 0) { if($sleepTime > 0) {
usleep($sleepTime); usleep($sleepTime);
} }
} }
//Close the client connection
$this->client->Terminate();
// Shutdown // Shutdown
$this->quit(); $this->quit();
} }
@ -330,43 +335,51 @@ class ManiaControl implements CommandListener {
$this->client = new \IXR_ClientMulticall_Gbx(); $this->client = new \IXR_ClientMulticall_Gbx();
$host = $this->config->server->xpath('host'); $host = $this->config->server->xpath('host');
if (!$host) trigger_error("Invalid server configuration (host).", E_USER_ERROR); if(!$host) {
$host = (string) $host[0]; trigger_error("Invalid server configuration (host).", E_USER_ERROR);
}
$host = (string)$host[0];
$port = $this->config->server->xpath('port'); $port = $this->config->server->xpath('port');
if (!$host) trigger_error("Invalid server configuration (port).", E_USER_ERROR); if(!$host) {
$port = (string) $port[0]; trigger_error("Invalid server configuration (port).", E_USER_ERROR);
}
$port = (string)$port[0];
$this->log("Connecting to server at {$host}:{$port}..."); $this->log("Connecting to server at {$host}:{$port}...");
// Connect // Connect
if (!$this->client->InitWithIp($host, $port, 20)) { if(!$this->client->InitWithIp($host, $port, 20)) {
trigger_error("Couldn't connect to server! " . $this->getClientErrorText(), E_USER_ERROR); trigger_error("Couldn't connect to server! " . $this->getClientErrorText(), E_USER_ERROR);
} }
$login = $this->config->server->xpath('login'); $login = $this->config->server->xpath('login');
if (!$login) trigger_error("Invalid server configuration (login).", E_USER_ERROR); if(!$login) {
$login = (string) $login[0]; trigger_error("Invalid server configuration (login).", E_USER_ERROR);
}
$login = (string)$login[0];
$pass = $this->config->server->xpath('pass'); $pass = $this->config->server->xpath('pass');
if (!$pass) trigger_error("Invalid server configuration (password).", E_USER_ERROR); if(!$pass) {
$pass = (string) $pass[0]; trigger_error("Invalid server configuration (password).", E_USER_ERROR);
}
$pass = (string)$pass[0];
// Authenticate // Authenticate
if (!$this->client->query('Authenticate', $login, $pass)) { if(!$this->client->query('Authenticate', $login, $pass)) {
trigger_error("Couldn't authenticate on server with user '{$login}'! " . $this->getClientErrorText(), E_USER_ERROR); trigger_error("Couldn't authenticate on server with user '{$login}'! " . $this->getClientErrorText(), E_USER_ERROR);
} }
// Enable callback system // Enable callback system
if (!$this->client->query('EnableCallbacks', true)) { if(!$this->client->query('EnableCallbacks', true)) {
trigger_error("Couldn't enable callbacks! " . $this->getClientErrorText(), E_USER_ERROR); trigger_error("Couldn't enable callbacks! " . $this->getClientErrorText(), E_USER_ERROR);
} }
// Wait for server to be ready // Wait for server to be ready
if (!$this->server->waitForStatus(4)) { if(!$this->server->waitForStatus(4)) {
trigger_error("Server couldn't get ready!", E_USER_ERROR); trigger_error("Server couldn't get ready!", E_USER_ERROR);
} }
// Set api version // Set api version
if (!$this->client->query('SetApiVersion', self::API_VERSION)) { if(!$this->client->query('SetApiVersion', self::API_VERSION)) {
trigger_error("Couldn't set API version '" . self::API_VERSION . "'! This might cause problems. " . $this->getClientErrorText()); trigger_error("Couldn't set API version '" . self::API_VERSION . "'! This might cause problems. " . $this->getClientErrorText());
} }
@ -377,15 +390,19 @@ class ManiaControl implements CommandListener {
$this->client->query('SendHideManialinkPage'); $this->client->query('SendHideManialinkPage');
// Enable script callbacks if needed // Enable script callbacks if needed
if ($this->server->getGameMode() != 0) return; if($this->server->getGameMode() != 0) {
if (!$this->client->query('GetModeScriptSettings')) { return;
}
if(!$this->client->query('GetModeScriptSettings')) {
trigger_error("Couldn't get mode script settings. " . $this->getClientErrorText()); trigger_error("Couldn't get mode script settings. " . $this->getClientErrorText());
return; return;
} }
$scriptSettings = $this->client->getResponse(); $scriptSettings = $this->client->getResponse();
if (!array_key_exists('S_UseScriptCallbacks', $scriptSettings)) return; if(!array_key_exists('S_UseScriptCallbacks', $scriptSettings)) {
return;
}
$scriptSettings['S_UseScriptCallbacks'] = true; $scriptSettings['S_UseScriptCallbacks'] = true;
if (!$this->client->query('SetModeScriptSettings', $scriptSettings)) { if(!$this->client->query('SetModeScriptSettings', $scriptSettings)) {
trigger_error("Couldn't set mode script settings to enable script callbacks. " . $this->getClientErrorText()); trigger_error("Couldn't set mode script settings to enable script callbacks. " . $this->getClientErrorText());
return; return;
} }