Renamed method, added missing config + expanded debug line a bit.

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/city/config.php b/application/city/config.php
index ab67804f6d5528712cd0de237b9dd25b284a5f80..9a3e9b2794189e99b7f2ab9a2bc8da0c6f526f02 100644 (file)
--- 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 8735bbbadccccae017764edc1dc5f2858c7b22ac..51abb5c7af70e1339ace01037fb88fbde22676f1 100644 (file)
--- 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 bf6fff1e27b697360eed2bbda9013424bb7c7603..31f284832a5f4c9de6e92a2720628fa351662c63 100644 (file)
--- 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 a86b73fee43e0db05c8968c46a4fb92b864813bb..888b9d708e2dcb443caddf94a7d46c82b20f35f5 100644 (file)
--- 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');
        }