X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fclass_ApplicationHelper.php;h=6c1f8858bf6e6ce42cb006d2a57a2cc523b6fb28;hb=d158de7fb54536874f866c02e0e61f26115419d9;hp=197a02d283b5791a9c1b2d566df6d9f94858ac86;hpb=e72a298bbe09dff03866d55d076d8afa6efc4fb7;p=hub.git

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index 197a02d28..6c1f8858b 100644
--- a/application/hub/class_ApplicationHelper.php
+++ b/application/hub/class_ApplicationHelper.php
@@ -152,6 +152,12 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		// Set this application in registry
 		Registry::getRegistry()->addInstance('app', $this);
 
+		// Is no external IP set?
+		if ($this->getConfigInstance()->getConfigEntry('external_ip') == '') {
+			// Determine external IP
+			$this->getConfigInstance()->setConfigEntry('external_ip', ConsoleTools::determineExternalIp());
+		} // END - if
+
 		// Default response is console
 		$response = $this->getResponseTypeFromSystem();
 		$responseType = $this->getResponseTypeFromSystem();
@@ -188,8 +194,8 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 			$requestInstance->setRequestElement('command', $commandName);
 		} // END - if
 
-		// Get a resolver
-		$resolverClass = sprintf("Hub%sControllerResolver", $this->convertToClassName($responseType));
+		// Get a controller resolver
+		$resolverClass = $this->convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver');
 		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
 		// Get a controller instance as well
@@ -201,9 +207,9 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		// -------------------------- Shutdown phase --------------------------
 		// Shutting down the hub by saying "good bye" to all connected peers
 		// and other hubs, flushing all queues and caches.
-		$this->debugOutput('MAIN: Shutdown in progress, main loop exited.');
+		self::createDebugInstance(__CLASS__)->debugOutput('MAIN: Shutdown in progress, main loop exited.');
 		$this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance);
-		$this->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
+		self::createDebugInstance(__CLASS__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
 	}
 
 	/**
@@ -216,7 +222,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	public function handleFatalMessages (array $messageList) {
 		// Walk through all messages
 		foreach ($messageList as $message) {
-			die(__METHOD__ . ':MSG:' . $message);
+			exit(__METHOD__ . ':MSG:' . $message);
 		} // END - foreach
 	}