X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fmain%2Fpools%2Flistener%2Fclass_DefaultListenerPool.php;h=82e5ced4aae91914667ed67ee22168dbd38fd3d0;hb=280fca59f8ed35ddde36a794c7a9f4991911e46a;hp=99579c55cee87fcf04318f5c9d8152aa0917b3c7;hpb=02f5d01514d6dcd9a0b5e2b07aa5b1bc9265ea33;p=hub.git

diff --git a/application/hub/main/pools/listener/class_DefaultListenerPool.php b/application/hub/main/pools/listener/class_DefaultListenerPool.php
index 99579c55c..82e5ced4a 100644
--- a/application/hub/main/pools/listener/class_DefaultListenerPool.php
+++ b/application/hub/main/pools/listener/class_DefaultListenerPool.php
@@ -2,11 +2,11 @@
 /**
  * A default listener pool
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Hub Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ class DefaultListenerPool extends BasePool implements PoolableListener {
 	 * @param	$nodeInstance		A NodeHelper instance
 	 * @return	$listenerInstance	An instance a prepared listener class
 	 */
-	public final static function createDefaultListenerPool (NodeHelper $nodeInstance) {
+	public static final function createDefaultListenerPool (NodeHelper $nodeInstance) {
 		// Get new instance
 		$listenerInstance = new DefaultListenerPool();
 
@@ -57,11 +57,11 @@ class DefaultListenerPool extends BasePool implements PoolableListener {
 	 */
 	public function addListener (Listenable $listenerInstance) {
 		// Add this listener instance to the instance list
-		parent::addInstance($listenerInstance->getProtocol(), 'listener', $listenerInstance);
+		parent::addInstance($listenerInstance->getProtocolName(), 'listener', $listenerInstance);
 
 		// Debug message
-		$this->debugOutput(
-			'POOL: Listener ' . $listenerInstance->__toString() .
+		self::createDebugInstance(__CLASS__)->debugOutput(
+			'POOL[' . __METHOD__ . ':' . __LINE__ . ']: Listener ' . $listenerInstance->__toString() .
 			' listening to ' . $listenerInstance->getListenAddress() . ':' .
 			$listenerInstance->getListenPort() . ' added to listener pool.'
 		);
@@ -74,16 +74,16 @@ class DefaultListenerPool extends BasePool implements PoolableListener {
 	 */
 	public function doShutdown () {
 		// Debug message
-		$this->debugOutput('POOL: Shutting down listener pool - START');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('POOL[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down listener pool - CALLED!');
 
 		// Get a new visitor
-		$visitorInstance = ObjectFactory::createObjectByConfiguredName('listener_pool_visitor_class');
+		$visitorInstance = ObjectFactory::createObjectByConfiguredName('shutdown_listener_pool_visitor_class');
 
 		// Start visiting
 		$this->accept($visitorInstance);
 
 		// Debug message
-		$this->debugOutput('POOL: Shutting down listener pool - FINISHED');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('POOL[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down listener pool - EXIT!');
 	}
 }