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

cleanup, exception handling

Browse Source
This commit is contained in:
kremsy
2014-01-20 20:51:03 +01:00
committed by Steffen Schröder
parent 796d46f199
commit a17037c3cb
13 changed files with 190 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
application/core/ManiaControl.php
View File

@ -60,6 +60,7 @@ class ManiaControl implements CommandListener {
const OS_UNIX = 'Unix';
const OS_WIN = 'Windows';
const CONNECT_TIMEOUT = 20;
const SCRIPT_TIMEOUT = 20;
/**
* Public properties
@ -83,6 +84,7 @@ class ManiaControl implements CommandListener {
public $statisticManager = null;
public $updateManager = null;
/**
* Private properties
*/
@ -155,21 +157,6 @@ class ManiaControl implements CommandListener {
return self::OS_UNIX;
}
/**
* Return message composed of client error message and error code
*
* @param object $client
* @return string
*/
public function getClientErrorText($client = null) {
/*if(is_object($client)) {
return $client->getErrorMessage() . ' (' . $client->getErrorCode() . ')';
}
return $this->client->getErrorMessage() . ' (' . $this->client->getErrorCode() . ')';*/
//TODO
}
/**
* Handle Version Command
*
@ -234,11 +221,8 @@ class ManiaControl implements CommandListener {
// Hide manialinks
$this->client->sendHideManialinkPage();
//TODO: $this->client->delete()
// Close connection
//$this->client->Terminate();
//Close the client connection
$this->client->delete($this->server->ip, $this->server->port);
$this->log('Quitting ManiaControl!');
exit();
@ -262,9 +246,6 @@ class ManiaControl implements CommandListener {
// Hide widgets
$this->client->sendHideManialinkPage();
// Close connection
//$this->client->Terminate(); //TODO
$this->log('Restarting ManiaControl!');
// Execute start script in background
@ -272,11 +253,9 @@ class ManiaControl implements CommandListener {
$command = 'sh ' . escapeshellarg(ManiaControlDir . '/ManiaControl.sh') . ' > /dev/null &';
exec($command);
} else {
// TODO: validate restart on windows
$command = 'start /B ' . escapeshellarg(ManiaControlDir . '/ManiaControl.bat');
pclose(popen($command, 'r'));
$command = escapeshellarg(ManiaControlDir . "\ManiaControl.bat");
system($command); //TODO, windows stucks here as long controller is running
}
exit();
}
@ -309,7 +288,7 @@ class ManiaControl implements CommandListener {
$loopStart = microtime(true);
// Disable script timeout
set_time_limit(30);
set_time_limit(self::SCRIPT_TIMEOUT);
// Manager callbacks
$this->callbackManager->manageCallbacks();
@ -322,9 +301,6 @@ class ManiaControl implements CommandListener {
}
}
//Close the client connection
//$this->client->Terminate();
// Shutdown
$this->quit();
}