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

improved shutdown

Browse Source
This commit is contained in:
Steffen Schröder 2014-05-06 10:34:57 +02:00
parent 7c4c18535f
commit b5d781076d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/core/ManiaControl.php
View File

@ -276,7 +276,6 @@ class ManiaControl implements CommandListener, TimerListener {
if ($message) { if ($message) {
$this->log($message); $this->log($message);
} }
exit(); exit();
} }
@ -414,7 +413,7 @@ class ManiaControl implements CommandListener, TimerListener {
// Wait for server to be ready // Wait for server to be ready
try { try {
if (!$this->server->waitForStatus(4)) { if (!$this->server->waitForStatus(4)) {
trigger_error("Server couldn't get ready!", E_USER_ERROR); $this->quit("Server couldn't get ready!");
} }
} catch (Exception $e) { } catch (Exception $e) {
// TODO remove // TODO remove

8
application/core/Server/Server.php
View File

@ -25,9 +25,7 @@ class Server implements CallbackListener {
/* /*
* Public Properties * Public Properties
*/ */
/** /** @var Config $config */
* @var Config $config
*/
public $config = null; public $config = null;
public $index = -1; public $index = -1;
public $ip = null; public $ip = null;
@ -59,7 +57,7 @@ class Server implements CallbackListener {
$this->serverCommands = new ServerCommands($maniaControl); $this->serverCommands = new ServerCommands($maniaControl);
$this->usageReporter = new UsageReporter($maniaControl); $this->usageReporter = new UsageReporter($maniaControl);
$this->rankingManager = new RankingManager($maniaControl); $this->rankingManager = new RankingManager($maniaControl);
$this->scriptManager = new ScriptManager($maniaControl); $this->scriptManager = new ScriptManager($maniaControl);
// Register for callbacks // Register for callbacks
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit');
@ -259,7 +257,7 @@ class Server implements CallbackListener {
if (!$dataDirectory) { if (!$dataDirectory) {
return null; return null;
} }
return "{$dataDirectory}Maps".DIRECTORY_SEPARATOR; return "{$dataDirectory}Maps" . DIRECTORY_SEPARATOR;
} }
/** /**