From 8c7c0f9fd2aa0d52a3f11d73f1fa5dcffbbf622d Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 29 Jun 2015 02:06:50 +0200
Subject: [PATCH] Renamed method, added missing config + expanded debug line a
bit.
Signed-off-by: Roland Haeder <roland@mxchange.org>
---
application/city/config.php | 3 +++
application/city/main/city_daemon/class_BaseCityDaemon.php | 4 ++--
.../class_CityDaemonTaskHandlerInitializerFilter.php | 4 +---
.../city/main/states/city/virgin/class_CityVirginState.php | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/application/city/config.php b/application/city/config.php
index ab67804..9a3e9b2 100644
--- a/application/city/config.php
+++ b/application/city/config.php
@@ -55,6 +55,9 @@ $cfg->setConfigEntry('city_init_state_class', 'CityInitState');
// CFG: CITY-VIRGIN-STATE-CLASS
$cfg->setConfigEntry('city_virgin_state_class', 'CityVirginState');
+// CFG: CITY-ACTIVE-STATE-CLASS
+$cfg->setConfigEntry('city_active_state_class', 'CityActiveState');
+
/******************************************************************************
* HTML client *
******************************************************************************/
diff --git a/application/city/main/city_daemon/class_BaseCityDaemon.php b/application/city/main/city_daemon/class_BaseCityDaemon.php
index 8735bbb..51abb5c 100644
--- a/application/city/main/city_daemon/class_BaseCityDaemon.php
+++ b/application/city/main/city_daemon/class_BaseCityDaemon.php
@@ -182,8 +182,8 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter
$this->getStateInstance()->validateCityStateIsVirgin();
// ----------------------- Last step from here ------------------------
- // Activate the City. This is ALWAYS the last step in this method
- /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CITY[' . __METHOD__ . ':' . __LINE__ . ']: state=' . $this->getStateInstance()->__toString());
+ // Activate the city daemon. This is ALWAYS the last step in this method
+ /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CITY[' . __METHOD__ . ':' . __LINE__ . ']: state=' . $this->getStateInstance()->__toString() . ' - Activating ...');
$this->getStateInstance()->citySimulationIsActivated();
// ---------------------- Last step until here ------------------------
}
diff --git a/application/city/main/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php b/application/city/main/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
index bf6fff1..31f2848 100644
--- a/application/city/main/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
+++ b/application/city/main/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
@@ -71,9 +71,7 @@ class CityDaemonTaskHandlerInitializerFilter extends BaseCityFilter implements F
$handlerInstance->registerTask('map_expander', $taskInstance);
/*
- * Allow extra city-depending tasks, e.g. the bootstrapper city needs
- * booting its DHT. DHTs are decentralized and are working on
- * peer-to-peer basis.
+ * Add extra tasks depending on daemon modus.
*/
$cityInstance->addExtraTasks($handlerInstance);
}
diff --git a/application/city/main/states/city/virgin/class_CityVirginState.php b/application/city/main/states/city/virgin/class_CityVirginState.php
index a86b73f..888b9d7 100644
--- a/application/city/main/states/city/virgin/class_CityVirginState.php
+++ b/application/city/main/states/city/virgin/class_CityVirginState.php
@@ -54,7 +54,7 @@ class CityVirginState extends BaseCityState implements Stateable {
*
* @return void
*/
- public function cityIsActivated () {
+ public function citySimulationIsActivated () {
// Create the new state instance
CityStateFactory::createCityStateInstanceByName('active');
}
--
2.39.5