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

moved server config loading into server class

Browse Source
This commit is contained in:
Steffen Schröder 2014-03-20 16:19:50 +01:00
parent e7b2e7ec92
commit 7006c4c8db
1 changed files with 105 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
application/core/ManiaControl.php
View File

@ -62,7 +62,10 @@ class ManiaControl implements CommandListener, TimerListener {
public $chat = null;
public $config = null;
public $configurator = null;
/** @var Connection $client */
/**
*
* @var Connection $client
*/
public $client = null;
public $commandManager = null;
public $database = null;
@ -88,7 +91,7 @@ class ManiaControl implements CommandListener, TimerListener {
* Construct ManiaControl
*/
public function __construct() {
//Construct Error Handler
// Construct Error Handler
$this->errorHandler = new ErrorHandler($this);
$this->log('Loading ManiaControl v' . self::VERSION . '...');
@ -116,7 +119,7 @@ class ManiaControl implements CommandListener, TimerListener {
$this->pluginManager = new PluginManager($this);
$this->updateManager = new UpdateManager($this);
//Define Permission Levels
// Define Permission Levels
$this->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_SHUTDOWN, AuthenticationManager::AUTH_LEVEL_SUPERADMIN);
$this->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_RESTART, AuthenticationManager::AUTH_LEVEL_SUPERADMIN);
@ -229,18 +232,19 @@ class ManiaControl implements CommandListener, TimerListener {
$this->client->sendHideManialinkPage();
// Close the client connection
$this->client->delete($this->server->ip, $this->server->port);
} catch(FatalException $e) {
}
catch (FatalException $e) {
$this->errorHandler->triggerDebugNotice($e->getMessage() . " File: " . $e->getFile() . " Line: " . $e->getLine());
}
}
//Check and Trigger Fatal Errors
// Check and Trigger Fatal Errors
$error = error_get_last();
if ($error && ($error['type'] & E_FATAL)) {
$this->errorHandler->errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
}
//Disable Garbage Collector
// Disable Garbage Collector
$this->collectGarbage();
gc_disable();
@ -272,7 +276,8 @@ class ManiaControl implements CommandListener, TimerListener {
if ($this->getOS(self::OS_UNIX)) {
$command = 'sh ' . escapeshellarg(ManiaControlDir . '/ManiaControl.sh') . ' > /dev/null &';
exec($command);
} else {
}
else {
$command = escapeshellarg(ManiaControlDir . "\ManiaControl.bat");
system($command); // TODO, windows stucks here as long controller is running
}
@ -300,7 +305,7 @@ class ManiaControl implements CommandListener, TimerListener {
// AfterInit callback
$this->callbackManager->triggerCallback(CallbackManager::CB_AFTERINIT);
//Enable Garbage Collecting
// Enable Garbage Collecting
gc_enable();
$this->timerManager->registerTimerListening($this, 'collectGarbage', 1000 * 60);
@ -312,7 +317,7 @@ class ManiaControl implements CommandListener, TimerListener {
$this->log('Link: maniaplanet://#join=' . $this->server->login . '@' . $this->server->titleId);
// Main loop
while(!$this->shutdownRequested) {
while (!$this->shutdownRequested) {
$loopStart = microtime(true);
// Disable script timeout
@ -321,9 +326,9 @@ class ManiaControl implements CommandListener, TimerListener {
try {
// Manager callbacks
$this->callbackManager->manageCallbacks();
} catch(FatalException $e) {
//TODO remove
}
catch (FatalException $e) {
// TODO remove
if ($this->errorHandler) {
$this->errorHandler->triggerDebugNotice("Fatal Exception: " . $e->getMessage() . " Trace: " . $e->getTraceAsString());
}
@ -336,7 +341,7 @@ class ManiaControl implements CommandListener, TimerListener {
// Yield for next tick
$loopEnd = microtime(true);
$sleepTime = (int)(5000 - ($loopEnd - $loopStart) * 1000000);
$sleepTime = (int) (5000 - ($loopEnd - $loopStart) * 1000000);
if ($sleepTime > 0) {
usleep($sleepTime);
}
@ -358,34 +363,16 @@ class ManiaControl implements CommandListener, TimerListener {
*/
private function connect() {
// Load remote client
$host = $this->config->server->xpath('host');
if (!$host) {
trigger_error("Invalid server configuration (host).", E_USER_ERROR);
}
$host = (string)$host[0];
$port = $this->config->server->xpath('port');
if (!$host) {
trigger_error("Invalid server configuration (port).", E_USER_ERROR);
}
$port = (string)$port[0];
$success = $this->server->loadConfig();
$this->log("Connecting to server at {$host}:{$port}...");
$login = $this->config->server->xpath('login');
if (!$login) {
trigger_error("Invalid server configuration (login).", E_USER_ERROR);
}
$login = (string)$login[0];
$pass = $this->config->server->xpath('pass');
if (!$pass) {
trigger_error("Invalid server configuration (password).", E_USER_ERROR);
}
$pass = (string)$pass[0];
$this->log("Connecting to server at {$this->server->config->host}:{$this->server->config->port}...");
try {
$this->client = Connection::factory($host, $port, self::CONNECT_TIMEOUT, $login, $pass);
} catch(Exception $e) {
trigger_error("Couldn't authenticate on server with user '{$login}'! " . $e->getMessage(), E_USER_ERROR);
$this->client = Connection::factory($this->server->config->host, $this->server->config->port, self::CONNECT_TIMEOUT,
$this->server->config->login, $this->server->config->pass);
}
catch (Exception $e) {
trigger_error("Couldn't authenticate on server with user '{$this->server->config->login}'! " . $e->getMessage(), E_USER_ERROR);
}
// Enable callback system
@ -396,8 +383,9 @@ class ManiaControl implements CommandListener, TimerListener {
if (!$this->server->waitForStatus(4)) {
trigger_error("Server couldn't get ready!", E_USER_ERROR);
}
} catch(FatalException $e) {
//TODO remove
}
catch (FatalException $e) {
// TODO remove
if ($this->errorHandler) {
$this->errorHandler->triggerDebugNotice("Fatal Exception: " . $e->getMessage() . " Trace: " . $e->getTraceAsString());
}
@ -411,27 +399,25 @@ class ManiaControl implements CommandListener, TimerListener {
$this->client->sendHideManialinkPage();
// Enable script callbacks if needed
if ($this->server->getGameMode() != 0) {
return;
}
if ($this->server->getGameMode() != 0) return;
try {
$scriptSettings = $this->client->getModeScriptSettings();
} catch(Exception $e) {
}
catch (Exception $e) {
if ($e->getMessage() == 'Not in script mode.') {
return;
}
throw $e;
}
if (!array_key_exists('S_UseScriptCallbacks', $scriptSettings)) {
return;
}
if (!array_key_exists('S_UseScriptCallbacks', $scriptSettings)) return;
$scriptSettings['S_UseScriptCallbacks'] = true;
try {
$this->client->setModeScriptSettings($scriptSettings);
} catch(Exception $e) {
}
catch (Exception $e) {
trigger_error("Couldn't set mode script settings to enable script callbacks. " . $e->getMessage());
return;
}