added support for "-config=" parameter to load another xml file
This commit is contained in:
Steffen Schröder
parent
df976a8229
commit
509251c5f7
@ -37,24 +37,24 @@ require_once __DIR__ . '/Libs/curl-easy/autoload.php';
|
||||
/**
|
||||
* ManiaControl Server Controller for ManiaPlanet Server
|
||||
*
|
||||
* @author steeffeen & kremsy
|
||||
* @author ManiaControl Team
|
||||
* @copyright ManiaControl Copyright © 2014 ManiaControl Team
|
||||
* @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
|
||||
* @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
|
||||
*/
|
||||
class ManiaControl implements CommandListener, TimerListener {
|
||||
/*
|
||||
* Constants
|
||||
*/
|
||||
const VERSION = '0.12';
|
||||
const API_VERSION = '2013-04-16';
|
||||
const MIN_DEDIVERSION = '2014-04-02_18_00';
|
||||
const OS_UNIX = 'Unix';
|
||||
const OS_WIN = 'Windows';
|
||||
const CONNECT_TIMEOUT = 50;
|
||||
const SCRIPT_TIMEOUT = 20;
|
||||
const URL_WEBSERVICE = 'http://ws.maniacontrol.com/';
|
||||
const VERSION = '0.12';
|
||||
const API_VERSION = '2013-04-16';
|
||||
const MIN_DEDIVERSION = '2014-04-02_18_00';
|
||||
const OS_UNIX = 'Unix';
|
||||
const OS_WIN = 'Windows';
|
||||
const CONNECT_TIMEOUT = 50;
|
||||
const SCRIPT_TIMEOUT = 20;
|
||||
const URL_WEBSERVICE = 'http://ws.maniacontrol.com/';
|
||||
const SETTING_PERMISSION_SHUTDOWN = 'Shutdown ManiaControl';
|
||||
const SETTING_PERMISSION_RESTART = 'Restart ManiaControl';
|
||||
const SETTING_PERMISSION_RESTART = 'Restart ManiaControl';
|
||||
|
||||
/*
|
||||
* Public Properties
|
||||
@ -63,9 +63,12 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
public $authenticationManager = null;
|
||||
public $callbackManager = null;
|
||||
public $chat = null;
|
||||
public $config = null;
|
||||
public $config = null;
|
||||
public $configurator = null;
|
||||
/** @var Connection $client */
|
||||
/**
|
||||
*
|
||||
* @var Connection $client
|
||||
*/
|
||||
public $client = null;
|
||||
public $commandManager = null;
|
||||
public $database = null;
|
||||
@ -96,28 +99,27 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
|
||||
$this->log('Loading ManiaControl v' . self::VERSION . '...');
|
||||
|
||||
// Load config
|
||||
$this->config = FileUtil::loadConfig('server.xml');
|
||||
$this->loadConfig();
|
||||
|
||||
// Load ManiaControl Modules
|
||||
$this->callbackManager = new CallbackManager($this);
|
||||
$this->timerManager = new TimerManager($this);
|
||||
$this->database = new Database($this);
|
||||
$this->fileReader = new AsynchronousFileReader($this);
|
||||
$this->billManager = new BillManager($this);
|
||||
$this->settingManager = new SettingManager($this);
|
||||
$this->statisticManager = new StatisticManager($this);
|
||||
$this->manialinkManager = new ManialinkManager($this);
|
||||
$this->actionsMenu = new ActionsMenu($this);
|
||||
$this->chat = new Chat($this);
|
||||
$this->commandManager = new CommandManager($this);
|
||||
$this->server = new Server($this);
|
||||
$this->callbackManager = new CallbackManager($this);
|
||||
$this->timerManager = new TimerManager($this);
|
||||
$this->database = new Database($this);
|
||||
$this->fileReader = new AsynchronousFileReader($this);
|
||||
$this->billManager = new BillManager($this);
|
||||
$this->settingManager = new SettingManager($this);
|
||||
$this->statisticManager = new StatisticManager($this);
|
||||
$this->manialinkManager = new ManialinkManager($this);
|
||||
$this->actionsMenu = new ActionsMenu($this);
|
||||
$this->chat = new Chat($this);
|
||||
$this->commandManager = new CommandManager($this);
|
||||
$this->server = new Server($this);
|
||||
$this->authenticationManager = new AuthenticationManager($this);
|
||||
$this->playerManager = new PlayerManager($this);
|
||||
$this->mapManager = new MapManager($this);
|
||||
$this->configurator = new Configurator($this);
|
||||
$this->pluginManager = new PluginManager($this);
|
||||
$this->updateManager = new UpdateManager($this);
|
||||
$this->playerManager = new PlayerManager($this);
|
||||
$this->mapManager = new MapManager($this);
|
||||
$this->configurator = new Configurator($this);
|
||||
$this->pluginManager = new PluginManager($this);
|
||||
$this->updateManager = new UpdateManager($this);
|
||||
|
||||
// Define Permission Levels
|
||||
$this->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_SHUTDOWN, AuthenticationManager::AUTH_LEVEL_SUPERADMIN);
|
||||
@ -128,12 +130,27 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
$this->commandManager->registerCommandListener('restart', $this, 'command_Restart', true, 'Restarts ManiaControl.');
|
||||
$this->commandManager->registerCommandListener('shutdown', $this, 'command_Shutdown', true, 'Shuts ManiaControl down.');
|
||||
|
||||
//Check connection every 30 seconds
|
||||
// Check connection every 30 seconds
|
||||
$this->timerManager->registerTimerListening($this, 'checkConnection', 1000 * 30);
|
||||
|
||||
$this->errorHandler->init();
|
||||
}
|
||||
|
||||
/**
|
||||
* Load the Config XML-File
|
||||
*/
|
||||
private function loadConfig() {
|
||||
$configId = CommandLineHelper::getParameter('-config');
|
||||
$configFileName = ($configId ? $configId : 'server.xml');
|
||||
$this->config = FileUtil::loadConfig($configFileName);
|
||||
if (!$this->config) {
|
||||
trigger_error("Error loading Configuration XML-File! ('{$configFileName}')", E_USER_ERROR);
|
||||
}
|
||||
if (!$this->config->server->port || $this->config->server->port == 'port') {
|
||||
trigger_error("Your Configuration File ('{$configFileName}') doesn't seem to be maintained. Please check it again!", E_USER_ERROR);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks connection every xxx Minutes
|
||||
*
|
||||
@ -151,11 +168,10 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
* @param string $message
|
||||
*/
|
||||
public function log($message, $stripCodes = false) {
|
||||
$date = date("d.M y H:i:s");
|
||||
if ($stripCodes) {
|
||||
$message = Formatter::stripCodes($message);
|
||||
}
|
||||
logMessage($date . ' ' . $message);
|
||||
logMessage($message);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -183,7 +199,7 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
/**
|
||||
* Handle Version Command
|
||||
*
|
||||
* @param array $chatCallback
|
||||
* @param array $chatCallback
|
||||
* @param Player $player
|
||||
*/
|
||||
public function command_Version(array $chatCallback, Player $player) {
|
||||
@ -194,7 +210,7 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
/**
|
||||
* Handle Restart AdminCommand
|
||||
*
|
||||
* @param array $chatCallback
|
||||
* @param array $chatCallback
|
||||
* @param Player $player
|
||||
*/
|
||||
public function command_Restart(array $chatCallback, Player $player) {
|
||||
@ -208,7 +224,7 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
/**
|
||||
* Handle //shutdown command
|
||||
*
|
||||
* @param array $chat
|
||||
* @param array $chat
|
||||
* @param Player $player
|
||||
*/
|
||||
public function command_Shutdown(array $chat, Player $player) {
|
||||
@ -248,7 +264,8 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
$this->client->sendHideManialinkPage();
|
||||
// Close the client connection
|
||||
$this->client->delete($this->server->ip, $this->server->port);
|
||||
} catch(TransportException $e) {
|
||||
}
|
||||
catch (TransportException $e) {
|
||||
$this->errorHandler->triggerDebugNotice($e->getMessage() . " File: " . $e->getFile() . " Line: " . $e->getLine());
|
||||
}
|
||||
}
|
||||
@ -292,7 +309,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
|
||||
}
|
||||
@ -313,8 +331,8 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
|
||||
// Check if the version of the server is high enough
|
||||
$version = $this->client->getVersion();
|
||||
if($version->build < self::MIN_DEDIVERSION) {
|
||||
trigger_error("The server has version ".$version->build.", while at least ".self::MIN_DEDIVERSION." is required!", E_USER_ERROR);
|
||||
if ($version->build < self::MIN_DEDIVERSION) {
|
||||
trigger_error("The server has version " . $version->build . ", while at least " . self::MIN_DEDIVERSION . " is required!", E_USER_ERROR);
|
||||
}
|
||||
|
||||
// OnInit callback
|
||||
@ -339,7 +357,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
|
||||
@ -348,7 +366,8 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
try {
|
||||
// Manager callbacks
|
||||
$this->callbackManager->manageCallbacks();
|
||||
} catch(TransportException $e) {
|
||||
}
|
||||
catch (TransportException $e) {
|
||||
$this->log("Connection interrupted!");
|
||||
// TODO remove
|
||||
if ($this->errorHandler) {
|
||||
@ -357,14 +376,13 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
$this->quit($e->getMessage());
|
||||
}
|
||||
|
||||
|
||||
// Manage FileReader
|
||||
$this->fileReader->appendData();
|
||||
|
||||
// Yield for next tick
|
||||
$loopEnd = microtime(true);
|
||||
|
||||
$sleepTime = (int)(2000 - ($loopEnd - $loopStart) * 1000000);
|
||||
$sleepTime = (int) (2000 - ($loopEnd - $loopStart) * 1000000);
|
||||
if ($sleepTime > 0) {
|
||||
usleep($sleepTime);
|
||||
}
|
||||
@ -392,7 +410,8 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
|
||||
try {
|
||||
$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) {
|
||||
}
|
||||
catch (Exception $e) {
|
||||
trigger_error("Couldn't authenticate on server with user '{$this->server->config->login}'! " . $e->getMessage(), E_USER_ERROR);
|
||||
}
|
||||
|
||||
@ -404,7 +423,8 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
if (!$this->server->waitForStatus(4)) {
|
||||
trigger_error("Server couldn't get ready!", E_USER_ERROR);
|
||||
}
|
||||
} catch(Exception $e) {
|
||||
}
|
||||
catch (Exception $e) {
|
||||
// TODO remove
|
||||
if ($this->errorHandler) {
|
||||
$this->errorHandler->triggerDebugNotice("Fatal Exception: " . $e->getMessage() . " Trace: " . $e->getTraceAsString());
|
||||
@ -425,7 +445,8 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
|
||||
try {
|
||||
$scriptSettings = $this->client->getModeScriptSettings();
|
||||
} catch(NotInScriptModeException $e) {
|
||||
}
|
||||
catch (NotInScriptModeException $e) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -436,8 +457,9 @@ class ManiaControl implements CommandListener, TimerListener {
|
||||
$scriptSettings['S_UseScriptCallbacks'] = true;
|
||||
try {
|
||||
$this->client->setModeScriptSettings($scriptSettings);
|
||||
} catch(Exception $e) {
|
||||
//TODO temp added 19.04.2014
|
||||
}
|
||||
catch (Exception $e) {
|
||||
// TODO temp added 19.04.2014
|
||||
$this->errorHandler->triggerDebugNotice("Exception line 437 ManiaControl.php " . $e->getMessage());
|
||||
|
||||
trigger_error("Couldn't set mode script settings to enable script callbacks. " . $e->getMessage());
|
||||
|
||||
Loading…
Reference in New Issue
Block a user