From 1dfd279547e8a4c1521205bc8ed19831b8741455 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 5 Apr 2015 16:41:57 +0200 Subject: [PATCH] The console part of the game will become a daemon that is taking care of all the "heavy work", like calculations of citizen happiness, land value and city growth (and many more). So the HTML client (and later AJAX) will only have to display the data and not do any heavy work (as this takes to long). Signed-off-by: Roland Haeder --- application/city/config.php | 10 +++++----- application/city/main/city/class_BaseCity.php | 10 +++++----- ...nCommand.php => class_CityConsoleDaemonCommand.php} | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) rename application/city/main/commands/console/{class_CityConsoleMainCommand.php => class_CityConsoleDaemonCommand.php} (95%) diff --git a/application/city/config.php b/application/city/config.php index 8a6298e..580273e 100644 --- a/application/city/config.php +++ b/application/city/config.php @@ -73,10 +73,10 @@ $cfg->setConfigEntry('menu_template_extension', '.xml'); ******************************************************************************/ // CFG: DEFAULT-CITY-CONSOLE-COMMAND -$cfg->setConfigEntry('default_city_console_command', 'main'); +$cfg->setConfigEntry('default_city_console_command', 'daemon'); -// CFG: CITY-CONSOLE-CMD-MAIN-RESOLVER-CLASS -$cfg->setConfigEntry('city_console_cmd_main_resolver_class', 'CityConsoleCommandResolver'); +// CFG: CITY-CONSOLE-CMD-DAEMON-RESOLVER-CLASS +$cfg->setConfigEntry('city_console_cmd_daemon_resolver_class', 'CityConsoleCommandResolver'); // CFG: CITY-PHP-REQUIREMENTS-FILTER $cfg->setConfigEntry('city_php_requirements_filter', 'CityPhpRequirementsFilter'); @@ -96,8 +96,8 @@ $cfg->setConfigEntry('city_shutdown_task_handler_filter', 'CityShutdownTaskHandl // CFG: CITY-SHUTDOWN-CITY-FILTER $cfg->setConfigEntry('city_shutdown_city_filter', 'CityShutdownCityFilter'); -// CFG: NEWS-MAIN-LIMIT -$cfg->setConfigEntry('news_main_limit', 5); +// CFG: NEWS-DAEMON-LIMIT +$cfg->setConfigEntry('news_daemon_limit', 5); // [EOF] ?> diff --git a/application/city/main/city/class_BaseCity.php b/application/city/main/city/class_BaseCity.php index add017e..812d426 100644 --- a/application/city/main/city/class_BaseCity.php +++ b/application/city/main/city/class_BaseCity.php @@ -80,7 +80,7 @@ class BaseCity extends BaseCitySystem implements Updateable, AddableCriteria { // Output all lines self::createDebugInstance(__CLASS__)->debugOutput(' '); - self::createDebugInstance(__CLASS__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . $this->getRequestInstance()->getRequestElement('mode') . ' mode active'); + self::createDebugInstance(__CLASS__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . $this->getRequestInstance()->getRequestElement('mode') . ' daemon starting'); self::createDebugInstance(__CLASS__)->debugOutput('Copyright (c) 2015 City Developer Team'); self::createDebugInstance(__CLASS__)->debugOutput(' '); self::createDebugInstance(__CLASS__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.'); @@ -218,13 +218,13 @@ class BaseCity extends BaseCitySystem implements Updateable, AddableCriteria { * @param $CityData An array with valid City data * @return void */ - public function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $CityData) { + public function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $cityData) { // Add all data the array provides - foreach (CityDistributedHashTableDatabaseWrapper::getAllElements() as $element) { + foreach (CityInformationDatabaseWrapper::getAllElements() as $element) { // Is the element there? - if (isset($CityData[$element])) { + if (isset($cityData[$element])) { // Add it - $dataSetInstance->addCriteria($element, $CityData[$element]); + $dataSetInstance->addCriteria($element, $cityData[$element]); } else { // Output warning message /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('City[' . __METHOD__ . ':' . __LINE__ . ']: addArrayToDataSet(): Element ' . $element . ' not found in CityData array.'); diff --git a/application/city/main/commands/console/class_CityConsoleMainCommand.php b/application/city/main/commands/console/class_CityConsoleDaemonCommand.php similarity index 95% rename from application/city/main/commands/console/class_CityConsoleMainCommand.php rename to application/city/main/commands/console/class_CityConsoleDaemonCommand.php index ea595f7..53b0ea2 100644 --- a/application/city/main/commands/console/class_CityConsoleMainCommand.php +++ b/application/city/main/commands/console/class_CityConsoleDaemonCommand.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityConsoleMainCommand extends BaseCommand implements Commandable { +class CityConsoleDaemonCommand extends BaseCommand implements Commandable { /** * Protected constructor * @@ -38,9 +38,9 @@ class CityConsoleMainCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createCityConsoleMainCommand (CommandResolver $resolverInstance) { + public static final function createCityConsoleDaemonCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new CityConsoleMainCommand(); + $commandInstance = new CityConsoleDaemonCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); -- 2.39.5