moved server config loading into server class
This commit is contained in:
Steffen Schröder
parent
e7b2e7ec92
commit
7006c4c8db
|
|
@ -35,24 +35,24 @@ require_once __DIR__ . '/Libs/curl-easy/autoload.php';
|
|||
/**
|
||||
* ManiaControl Server Controller for ManiaPlanet Server
|
||||
*
|
||||
* @author steeffeen & kremsy
|
||||
* @author steeffeen & kremsy
|
||||
* @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.01';
|
||||
const API_VERSION = '2013-04-16';
|
||||
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.01';
|
||||
const API_VERSION = '2013-04-16';
|
||||
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
|
||||
*/
|
||||
|
|
@ -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;
|
||||
|
|
@ -78,7 +81,7 @@ class ManiaControl implements CommandListener, TimerListener {
|
|||
public $timerManager = null;
|
||||
public $fileReader = null;
|
||||
public $billManager = null;
|
||||
|
||||
|
||||
/**
|
||||
* Private properties
|
||||
*/
|
||||
|
|
@ -88,38 +91,38 @@ 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 . '...');
|
||||
|
||||
|
||||
// Load config
|
||||
$this->config = FileUtil::loadConfig('server.xml');
|
||||
|
||||
|
||||
// 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);
|
||||
|
||||
//Define Permission Levels
|
||||
$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);
|
||||
$this->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_RESTART, AuthenticationManager::AUTH_LEVEL_SUPERADMIN);
|
||||
|
||||
|
||||
// Register for commands
|
||||
$this->commandManager->registerCommandListener('version', $this, 'command_Version');
|
||||
$this->commandManager->registerCommandListener('restart', $this, 'command_Restart', true);
|
||||
|
|
@ -164,7 +167,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) {
|
||||
|
|
@ -175,7 +178,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) {
|
||||
|
|
@ -189,7 +192,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) {
|
||||
|
|
@ -209,7 +212,7 @@ class ManiaControl implements CommandListener, TimerListener {
|
|||
if ($message) {
|
||||
$this->log($message);
|
||||
}
|
||||
|
||||
|
||||
exit();
|
||||
}
|
||||
|
||||
|
|
@ -219,31 +222,32 @@ class ManiaControl implements CommandListener, TimerListener {
|
|||
public function handleShutdown() {
|
||||
// OnShutdown callback
|
||||
$this->callbackManager->triggerCallback(CallbackManager::CB_ONSHUTDOWN);
|
||||
|
||||
|
||||
// Announce quit
|
||||
$this->chat->sendInformation('ManiaControl shutting down.');
|
||||
|
||||
|
||||
if ($this->client) {
|
||||
try {
|
||||
// Hide manialinks
|
||||
$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();
|
||||
|
||||
|
||||
$this->log('Quitting ManiaControl!');
|
||||
exit();
|
||||
}
|
||||
|
|
@ -256,23 +260,24 @@ class ManiaControl implements CommandListener, TimerListener {
|
|||
public function restart($message = null) {
|
||||
// Shutdown callback
|
||||
$this->callbackManager->triggerCallback(CallbackManager::CB_ONSHUTDOWN);
|
||||
|
||||
|
||||
// Announce restart
|
||||
$this->chat->sendInformation('Restarting ManiaControl...');
|
||||
if ($message) {
|
||||
$this->log($message);
|
||||
}
|
||||
|
||||
|
||||
// Hide widgets
|
||||
$this->client->sendHideManialinkPage();
|
||||
|
||||
|
||||
$this->log('Restarting ManiaControl!');
|
||||
|
||||
|
||||
// Execute start script in background
|
||||
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
|
||||
}
|
||||
|
|
@ -284,64 +289,64 @@ class ManiaControl implements CommandListener, TimerListener {
|
|||
*/
|
||||
public function run() {
|
||||
$this->log('Starting ManiaControl v' . self::VERSION . '!');
|
||||
|
||||
|
||||
// Register shutdown handler
|
||||
register_shutdown_function(array($this, 'handleShutdown'));
|
||||
|
||||
|
||||
// Connect to server
|
||||
$this->connect();
|
||||
|
||||
|
||||
// OnInit callback
|
||||
$this->callbackManager->triggerCallback(CallbackManager::CB_ONINIT);
|
||||
|
||||
|
||||
// Load plugins
|
||||
$this->pluginManager->loadPlugins();
|
||||
|
||||
|
||||
// AfterInit callback
|
||||
$this->callbackManager->triggerCallback(CallbackManager::CB_AFTERINIT);
|
||||
|
||||
//Enable Garbage Collecting
|
||||
|
||||
// Enable Garbage Collecting
|
||||
gc_enable();
|
||||
$this->timerManager->registerTimerListening($this, 'collectGarbage', 1000 * 60);
|
||||
|
||||
|
||||
// Announce ManiaControl
|
||||
$this->chat->sendInformation('ManiaControl v' . self::VERSION . ' successfully started!');
|
||||
|
||||
|
||||
// Loading finished
|
||||
$this->log('Loading completed!');
|
||||
$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
|
||||
set_time_limit(self::SCRIPT_TIMEOUT);
|
||||
|
||||
|
||||
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());
|
||||
}
|
||||
$this->quit($e->getMessage());
|
||||
}
|
||||
|
||||
|
||||
// Manage FileReader
|
||||
$this->fileReader->appendData();
|
||||
|
||||
|
||||
// Yield for next tick
|
||||
$loopEnd = microtime(true);
|
||||
|
||||
$sleepTime = (int)(5000 - ($loopEnd - $loopStart) * 1000000);
|
||||
|
||||
$sleepTime = (int) (5000 - ($loopEnd - $loopStart) * 1000000);
|
||||
if ($sleepTime > 0) {
|
||||
usleep($sleepTime);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Shutdown
|
||||
$this->quit();
|
||||
}
|
||||
|
|
@ -358,80 +363,61 @@ 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];
|
||||
|
||||
$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];
|
||||
|
||||
$success = $this->server->loadConfig();
|
||||
|
||||
$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
|
||||
$this->client->enableCallbacks(true);
|
||||
|
||||
|
||||
// Wait for server to be ready
|
||||
try {
|
||||
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());
|
||||
}
|
||||
$this->quit($e->getMessage());
|
||||
}
|
||||
|
||||
|
||||
// Connect finished
|
||||
$this->log("Server Connection successfully established!");
|
||||
|
||||
|
||||
// Hide old widgets
|
||||
$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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue