Continued:

[city.git] / application / city / classes / commands / console / class_CityConsoleDaemonCommand.php

diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
index b985a4aa829b6c1ecf524b9b3ef66f219fbfa161..b399a60487fddf56c9951d38b5ab487352190b05 100644 (file)
--- a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
+++ b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
@@ -3,15 +3,15 @@
 namespace Org\Mxchange\City\Command;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
-use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -21,7 +21,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2015, 2016 City Developer Team
+ * @copyright  Copyright (c) 2015 - 2023 City Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -84,9 +84,9 @@ class CityConsoleDaemonCommand extends BaseCommand implements Commandable {
                 * extra arguments which mostly override config entries or enable special
                 * features within the hub (none is ready at this development stage)
                 */
-               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Beginning with bootstrap...');
+               self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('BOOTSTRAP: Beginning with bootstrap...');
                $applicationInstance->getControllerInstance()->executeBootstrapFilters($requestInstance, $responseInstance);
-               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Bootstrap finished.');
+               self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('BOOTSTRAP: Bootstrap finished.');
 
                // Get city instance
                $cityInstance = CityDaemonFactory::createCityDaemonInstance();
@@ -102,10 +102,10 @@ class CityConsoleDaemonCommand extends BaseCommand implements Commandable {
                $cityInstance->activateCityDaemon($requestInstance, $responseInstance);
 
                // Get task handler instance
-               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = ObjectRegistry::getRegistry('generic')->getInstance('task_handler');
 
                // Debug message
-               self::createDebugInstance(__CLASS__)->debugOutput('MAIN: --- Entering main loop. ---');
+               self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('MAIN: --- Entering main loop. ---');
 
                /*
                 * ----------------------------- Main loop ----------------------------
@@ -116,10 +116,10 @@ class CityConsoleDaemonCommand extends BaseCommand implements Commandable {
                while (($cityInstance->isCityActive()) && ($handlerInstance->hasTasksLeft())) {
                        // Handle all tasks here
                        $handlerInstance->handleTasks();
-               } // END - while
+               }
 
                // Debug message
-               self::createDebugInstance(__CLASS__)->debugOutput('MAIN: --- Leaving main loop. ---');
+               self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('MAIN: --- Leaving main loop. ---');
        }
 
        /**