From: Roland Häder <roland@mxchange.org>
Date: Sun, 19 Feb 2023 02:03:40 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1456acc0908cb6caefe084bf09f147a62cecb4de;p=city.git

Continued:
- createDebugInstance() has two parameters, let's feed it with the actual line
  number
---

diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php
index 07f00df..1ac51c4 100644
--- 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__)->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(' ');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(' ');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' daemon starting');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('Copyright (c) 2015 - 2023 City Developer Team');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(' ');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('This is free software, and you are welcome to redistribute it under certain');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('conditions; see docs/COPYING for details.');
+		self::createDebugInstance(__CLASS__, __LINE__)->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__)->debugMessage('CITY[' . __METHOD__ . ':' . __LINE__ . ']: state=' . $this->getStateInstance()->__toString() . ' - Activating ...');
+		/* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->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
-				self::createDebugInstance(__CLASS__)->warningMessage(sprintf('BASE-CITY-DAEMON: Element %s not found in CityData array.', $element));
+				self::createDebugInstance(__CLASS__, __LINE__)->warningMessage(sprintf('BASE-CITY-DAEMON: Element %s not found in CityData array.', $element));
 			}
 		}
 	}
diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
index fec4f7a..8b86db2 100644
--- a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
+++ b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
@@ -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__)->debugMessage('BOOTSTRAP: Beginning with bootstrap...');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('BOOTSTRAP: Beginning with bootstrap...');
 		$applicationInstance->getControllerInstance()->executeBootstrapFilters($requestInstance, $responseInstance);
-		self::createDebugInstance(__CLASS__)->debugMessage('BOOTSTRAP: Bootstrap finished.');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('BOOTSTRAP: Bootstrap finished.');
 
 		// Get city instance
 		$cityInstance = CityDaemonFactory::createCityDaemonInstance();
@@ -105,7 +105,7 @@ class CityConsoleDaemonCommand extends BaseCommand implements Commandable {
 		$handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
 		// Debug message
-		self::createDebugInstance(__CLASS__)->debugMessage('MAIN: --- Entering main loop. ---');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('MAIN: --- Entering main loop. ---');
 
 		/*
 		 * ----------------------------- Main loop ----------------------------
@@ -119,7 +119,7 @@ class CityConsoleDaemonCommand extends BaseCommand implements Commandable {
 		}
 
 		// Debug message
-		self::createDebugInstance(__CLASS__)->debugMessage('MAIN: --- Leaving main loop. ---');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('MAIN: --- Leaving main loop. ---');
 	}
 
 	/**
diff --git a/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php
index 9b69ed2..6f355e8 100644
--- a/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php
+++ b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php
@@ -132,7 +132,7 @@ class CityInformationDatabaseFrontend extends BaseDatabaseFrontend implements Ci
 	 */
 	public function removeNonPublicDataFromArray(array $data) {
 		// Currently call only inner method
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage('CITY-WRAPPER[' . __METHOD__ . ':' . __LINE__ . ']: Calling parent::removeNonPublicDataFromArray(data) ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('CITY-WRAPPER[' . __METHOD__ . ':' . __LINE__ . ']: Calling parent::removeNonPublicDataFromArray(data) ...');
 		$data = parent::removeNonPublicDataFromArray($data);
 
 		// Return cleaned data
diff --git a/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php b/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php
index a3b7fda..ad381fe 100644
--- a/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php
+++ b/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php
@@ -130,7 +130,7 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS
 	 */
 	public function ifCityHasSections (int $cityId) {
 		// Check parameter
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->traceMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: cityId=%d - CALLED!', $cityId));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: cityId=%d - CALLED!', $cityId));
 		if ($cityId < 1) {
 			// Throw IAE
 			throw new InvalidArgumentException(sprintf('cityId=%d is not a valid id', $cityId), FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
@@ -152,11 +152,11 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS
 		$resultInstance = $this->doSelectByCriteria($searchInstance);
 
 		// Check if there is one entry
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: resultInstance=%s', $resultInstance->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: resultInstance=%s', $resultInstance->__toString()));
 		$isFound = $resultInstance->next();
 
 		// Return result
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->traceMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: isFound=%d - EXIT!', intval($isFound)));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: isFound=%d - EXIT!', intval($isFound)));
 		return $isFound;
 	}
 
@@ -171,7 +171,7 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS
 	 */
 	public function doInitialCityExpansion (int $cityId) {
 		// Check parameter
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->traceMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: cityId=%d - CALLED!', $cityId));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: cityId=%d - CALLED!', $cityId));
 		if ($cityId < 1) {
 			// Throw IAE
 			throw new InvalidArgumentException(sprintf('cityId=%d is not a valid id', $cityId), FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
@@ -199,7 +199,7 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS
 		$totalSections = (($radius + 1) * ($radius + 1) * $maxUp * ($maxDown + 1));
 
 		// Get data set instance
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: radius=%d,maxUp=%d,maxDown=%d,totalSections=%d', $radius, $maxUp, $maxDown, $totalSections));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: radius=%d,maxUp=%d,maxDown=%d,totalSections=%d', $radius, $maxUp, $maxDown, $totalSections));
 		$dataSetInstance = ObjectFactory::createObjectByConfiguredName('dataset_criteria_class', array(self::DB_TABLE_CITY_SECTIONS));
 
 		// Add values for "zero point"
@@ -232,7 +232,7 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS
 		$sections = [];
 
 		// Output message to ask for user's patience ...
-		self::createDebugInstance(__CLASS__)->debugMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: Writing %d sections for city %d ... (this may takes some time)', $totalSections, $cityId));
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: Writing %d sections for city %d ... (this may takes some time)', $totalSections, $cityId));
 
 		// Expand half of it to north/south (north=positive, south=negative)
 		for ($north = 1; $north < round($radius / 2); $north++) {
@@ -241,7 +241,7 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS
 				// Expand up/down (including "zero point")
 				for ($z = $maxDown; $z < ($maxUp + 1); $z++) {
 					// Fill array up with south/east/down ids
-					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage('[' . __METHOD__ . ':' . __LINE__ . ']: north=' . $north . ',west=' . $west . ',z=' . $z);
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('[' . __METHOD__ . ':' . __LINE__ . ']: north=' . $north . ',west=' . $west . ',z=' . $z);
 					$sections[($north * -1)][($west * -1)][$z]['type'] = self::SECTION_TYPE_EMPTY_LAND;
 					$sections[($north * -1)][($west * -1)][$z]['sub']  = self::SECTION_SUB_TYPE_GRASS;
 
@@ -262,7 +262,7 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS
 				// Loop through up/down values
 				foreach ($sectionY as $z => $sectionData) {
 					// Set all coordinates for positive directions
-					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage('[' . __METHOD__ . ':' . __LINE__ . ']: x=' . $x . ',y=' . $y . ',z=' . $z . ',sectionId=' . $sectionId);
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('[' . __METHOD__ . ':' . __LINE__ . ']: x=' . $x . ',y=' . $y . ',z=' . $z . ',sectionId=' . $sectionId);
 					$dataSetInstance->setCriteria(self::DB_COLUMN_SECTION_ID        , $sectionId);
 					$dataSetInstance->setCriteria(self::DB_COLUMN_SECTION_POSITION_X, $x);
 					$dataSetInstance->setCriteria(self::DB_COLUMN_SECTION_POSITION_Y, $y);
@@ -278,14 +278,14 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS
 				}
 
 				// Debug message
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage('[' . __METHOD__ . ':' . __LINE__ . ']: x=' . $x . ',y=' . $y . ' has been written.');
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('[' . __METHOD__ . ':' . __LINE__ . ']: x=' . $x . ',y=' . $y . ' has been written.');
 			}
 
 			// Debug message
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage('[' . __METHOD__ . ':' . __LINE__ . ']: x=' . $x . ' has been written.');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('[' . __METHOD__ . ':' . __LINE__ . ']: x=' . $x . ' has been written.');
 		}
 
 		// Thank you for waiting! :-)
-		self::createDebugInstance(__CLASS__)->debugMessage(sprintf('A total of %d sections has been written for city id %s', $totalSections, $cityId));
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('A total of %d sections has been written for city id %s', $totalSections, $cityId));
 	}
 }
diff --git a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
index d78d6bd..928ce54 100644
--- a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
+++ b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
@@ -82,7 +82,7 @@ class RegionInformationDatabaseFrontend extends BaseDatabaseFrontend implements
 	 */
 	public function removeNonPublicDataFromArray(array $data) {
 		// Currently call only inner method
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage('REGION-WRAPPER[' . __METHOD__ . ':' . __LINE__ . ']: Calling parent::removeNonPublicDataFromArray(data) ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('REGION-WRAPPER[' . __METHOD__ . ':' . __LINE__ . ']: Calling parent::removeNonPublicDataFromArray(data) ...');
 		$data = parent::removeNonPublicDataFromArray($data);
 
 		// Return cleaned data
diff --git a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php
index dacfc49..61ad803 100644
--- a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php
+++ b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php
@@ -71,7 +71,7 @@ class RegionMapDatabaseFrontend extends BaseDatabaseFrontend implements RegionMa
 	 */
 	public function removeNonPublicDataFromArray(array $data) {
 		// Currently call only inner method
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage('REGION-WRAPPER[' . __METHOD__ . ':' . __LINE__ . ']: Calling parent::removeNonPublicDataFromArray(data) ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('REGION-WRAPPER[' . __METHOD__ . ':' . __LINE__ . ']: Calling parent::removeNonPublicDataFromArray(data) ...');
 		$data = parent::removeNonPublicDataFromArray($data);
 
 		// Return cleaned data
diff --git a/application/city/classes/factories/states/city/class_CityStateFactory.php b/application/city/classes/factories/states/city/class_CityStateFactory.php
index 34f19bb..dc0a330 100644
--- a/application/city/classes/factories/states/city/class_CityStateFactory.php
+++ b/application/city/classes/factories/states/city/class_CityStateFactory.php
@@ -66,7 +66,7 @@ class CityStateFactory extends BaseFactory {
 		$cityInstance = CityDaemonFactory::createCityDaemonInstance();
 
 		// Debug message
-		self::createDebugInstance(__CLASS__)->debugMessage('CITY-STATE-FACTORY: City daemon state has changed from ' . $cityInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('CITY-STATE-FACTORY: City daemon state has changed from ' . $cityInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.');
 
 		// Once we have that state, set it in the city instance
 		$cityInstance->setStateInstance($stateInstance);
diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
index d83ff7b..12738c3 100644
--- a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
@@ -76,6 +76,6 @@ class CityDaemonInitializationFilter extends BaseCityFilter implements Filterabl
 		}
 
 		// Debug message
-		/* DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage('CITY-INIT-FILTER[' . __METHOD__ . ':' . __LINE__ . ']: City daemon has been added to registry.');
+		/* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('CITY-INIT-FILTER[' . __METHOD__ . ':' . __LINE__ . ']: City daemon has been added to registry.');
 	}
 }
diff --git a/application/city/classes/filter/class_BaseCityFilter.php b/application/city/classes/filter/class_BaseCityFilter.php
index aa50ed4..0bb4ace 100644
--- a/application/city/classes/filter/class_BaseCityFilter.php
+++ b/application/city/classes/filter/class_BaseCityFilter.php
@@ -71,7 +71,7 @@ abstract class BaseCityFilter extends BaseFilter {
 		$templateInstance->renderXmlContent($messageContent);
 
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage(str_replace('_', '-', strtoupper($messageType)) . '-TAG: Handling ' . strlen($messageContent) . ' bytes: ' . $messageContent);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(str_replace('_', '-', strtoupper($messageType)) . '-TAG: Handling ' . strlen($messageContent) . ' bytes: ' . $messageContent);
 
 		/*
 		 * The template system now stores all required data as 'general'
@@ -89,14 +89,14 @@ abstract class BaseCityFilter extends BaseFilter {
 			 */
 			if (is_null($value)) {
 				// Output a warning
-				self::createDebugInstance(__CLASS__)->debugMessage(str_replace('_', '-', strtoupper($messageType)) . '-TAG: Found not fully supported variable ' . $key . ' - skipping.');
+				self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(str_replace('_', '-', strtoupper($messageType)) . '-TAG: Found not fully supported variable ' . $key . ' - skipping.');
 
 				// Skip this part, don't write NULLs to the array
 				continue;
 			}
 
 			// Debug message
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage(str_replace('_', '-', strtoupper($messageType)) . '-TAG: key=' . $key . ',value=' . $value);
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(str_replace('_', '-', strtoupper($messageType)) . '-TAG: key=' . $key . ',value=' . $value);
 
 			// Set it now
 			$this->dataXmlNodes[$key] = $value;
diff --git a/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
index 9e481b5..a71b41b 100644
--- a/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
+++ b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
@@ -99,6 +99,6 @@ class CityDaemonBuildingGrowthTask extends BaseCityTask implements Taskable, Vis
 	 * @todo	0% done
 	 */
 	public function doShutdown () {
-		self::createDebugInstance(__CLASS__)->debugMessage('TASK[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down...');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('TASK[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down...');
 	}
 }
diff --git a/application/city/classes/tasks/daemon/class_CityDaemon b/application/city/classes/tasks/daemon/class_CityDaemon
index ef11a6e..2ff94c5 100644
--- a/application/city/classes/tasks/daemon/class_CityDaemon
+++ b/application/city/classes/tasks/daemon/class_CityDaemon
@@ -84,6 +84,6 @@ class CityDaemon???Task extends BaseTask implements Taskable, Visitable {
 	 * @todo	0% done
 	 */
 	public function doShutdown () {
-		self::createDebugInstance(__CLASS__)->debugOutput('TASK[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down...');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('TASK[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down...');
 	}
 }
diff --git a/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
index 05c9655..c9c827d 100644
--- a/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
+++ b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
@@ -99,6 +99,6 @@ class CityDaemonHouseholdGrowthTask extends BaseCityTask implements Taskable, Vi
 	 * @todo	0% done
 	 */
 	public function doShutdown () {
-		self::createDebugInstance(__CLASS__)->debugMessage('TASK[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down...');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('TASK[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down...');
 	}
 }
diff --git a/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php b/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
index 56b2566..da75c44 100644
--- a/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
+++ b/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
@@ -99,6 +99,6 @@ class CityDaemonMapExpanderTask extends BaseCityTask implements Taskable, Visita
 	 * @todo	0% done
 	 */
 	public function doShutdown () {
-		self::createDebugInstance(__CLASS__)->debugMessage('TASK[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down...');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('TASK[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down...');
 	}
 }