Continued:

[city.git] / application / city / classes / city_daemon / class_BaseCityDaemon.php

diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php
index 90e59b147bc1cdada7dd046606952e97b999592a..07f00df15c7bcb859b5c2d3c9d4354e41aa57faf 100644 (file)
--- a/application/city/classes/city_daemon/class_BaseCityDaemon.php
+++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php
@@ -114,14 +114,14 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda
                $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Output all lines
-               self::createDebugInstance(__CLASS__)->debugOutput(' ');
-               self::createDebugInstance(__CLASS__)->debugOutput($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' daemon starting');
-               self::createDebugInstance(__CLASS__)->debugOutput('Copyright (c) 2015 - 2023 City Developer Team');
-               self::createDebugInstance(__CLASS__)->debugOutput(' ');
-               self::createDebugInstance(__CLASS__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
-               self::createDebugInstance(__CLASS__)->debugOutput('This is free software, and you are welcome to redistribute it under certain');
-               self::createDebugInstance(__CLASS__)->debugOutput('conditions; see docs/COPYING for details.');
-               self::createDebugInstance(__CLASS__)->debugOutput(' ');
+               self::createDebugInstance(__CLASS__)->debugMessage(' ');
+               self::createDebugInstance(__CLASS__)->debugMessage($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' daemon starting');
+               self::createDebugInstance(__CLASS__)->debugMessage('Copyright (c) 2015 - 2023 City Developer Team');
+               self::createDebugInstance(__CLASS__)->debugMessage(' ');
+               self::createDebugInstance(__CLASS__)->debugMessage('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
+               self::createDebugInstance(__CLASS__)->debugMessage('This is free software, and you are welcome to redistribute it under certain');
+               self::createDebugInstance(__CLASS__)->debugMessage('conditions; see docs/COPYING for details.');
+               self::createDebugInstance(__CLASS__)->debugMessage(' ');
        }
 
        /**
@@ -200,7 +200,7 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda
 
                // ----------------------- Last step from here ------------------------
                // 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 ...');
+               /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage('CITY[' . __METHOD__ . ':' . __LINE__ . ']: state=' . $this->getStateInstance()->__toString() . ' - Activating ...');
                $this->getStateInstance()->citySimulationIsActivated();
                // ---------------------- Last step until here ------------------------
        }
@@ -251,7 +251,7 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda
                                $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.');
+                               self::createDebugInstance(__CLASS__)->warningMessage(sprintf('BASE-CITY-DAEMON: Element %s not found in CityData array.', $element));
                        }
                }
        }