cought fatal exception

This commit is contained in:
kremsy 2014-03-01 10:49:07 +01:00 committed by Steffen Schröder
parent 98b146f51d
commit 5dcc8e865c

View File

@ -327,7 +327,7 @@ class ManiaControl implements CommandListener, TimerListener {
} catch(FatalException $e) { } catch(FatalException $e) {
//TODO remove //TODO remove
if ($this->errorHandler) { if ($this->errorHandler) {
$this->errorHandler->triggerDebugNotice("Fatal Exception: " . $e->getMessage() . " tracestring " . $e->getTraceAsString()); $this->errorHandler->triggerDebugNotice("Fatal Exception: " . $e->getMessage() . " Trace: " . $e->getTraceAsString());
} }
$this->quit($e->getMessage()); $this->quit($e->getMessage());
} }
@ -394,9 +394,17 @@ class ManiaControl implements CommandListener, TimerListener {
$this->client->enableCallbacks(true); $this->client->enableCallbacks(true);
// Wait for server to be ready // Wait for server to be ready
try {
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);
} }
} catch(FatalException $e) {
//TODO remove
if ($this->errorHandler) {
$this->errorHandler->triggerDebugNotice("Fatal Exception: " . $e->getMessage() . " Trace: " . $e->getTraceAsString());
}
$this->quit($e->getMessage());
}
// Connect finished // Connect finished
$this->log("Server Connection successfully established!"); $this->log("Server Connection successfully established!");