'public static final' is the right thing, some variables renamed to make clear what...

[hub.git] / application / hub / main / filter / task / class_TaskHandlerInitializerFilter.php

diff --git a/application/hub/main/filter/task/class_TaskHandlerInitializerFilter.php b/application/hub/main/filter/task/class_TaskHandlerInitializerFilter.php
index da413addc9e7173aaefd37216e0b7fce7c06a3e2..6ea240d012ea301ec3a8139d80af87464f1a4dca 100644 (file)
--- a/application/hub/main/filter/task/class_TaskHandlerInitializerFilter.php
+++ b/application/hub/main/filter/task/class_TaskHandlerInitializerFilter.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Hub Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -37,7 +37,7 @@ class TaskHandlerInitializerFilter extends BaseFilter implements Filterable {
         *
         * @return      $filterInstance         An instance of this filter class
         */
-       public final static function createTaskHandlerInitializerFilter () {
+       public static final function createTaskHandlerInitializerFilter () {
                // Get a new instance
                $filterInstance = new TaskHandlerInitializerFilter();
 
@@ -61,20 +61,50 @@ class TaskHandlerInitializerFilter extends BaseFilter implements Filterable {
                // Get a new task handler instance
                $handlerInstance = ObjectFactory::createObjectByConfiguredName('task_handler_class');
 
-               // Register some tasks and provide both instances for this:
-               // 1.) Network package reader, needs to be delayed a little
-               $handlerInstance->registerTask('network_package_reader', $nodeInstance->getListenerPoolInstance());
-               // 2.) Query instance
-               $handlerInstance->registerTask('query_handler', $nodeInstance->getQueryConnectorInstance());
-
                // Generate idle task
                $taskInstance = ObjectFactory::createObjectByConfiguredName('idle_task_class');
 
                // Register it as well
                $handlerInstance->registerTask('idle_loop', $taskInstance);
 
+               // Network package reader, needs to be delayed a little
+               $handlerInstance->registerTask('network_package_reader', $nodeInstance->getListenerPoolInstance());
+
+               // Generate package writer task
+               $taskInstance = ObjectFactory::createObjectByConfiguredName('hub_package_writer_task_class');
+
+               // Register it as well
+               $handlerInstance->registerTask('network_package_writer', $taskInstance);
+
+               // Query handler instance
+               $handlerInstance->registerTask('query_handler', $nodeInstance->getQueryConnectorInstance());
+
+               // Queue handler instance
+               $handlerInstance->registerTask('queue_handler', $nodeInstance->getQueueConnectorInstance());
+
                // Put the task handler in registry
                Registry::getRegistry()->addInstance('task', $handlerInstance);
+
+               // Prepare a self-test task for the listeners
+               $taskInstance = ObjectFactory::createObjectByConfiguredName('hub_selfconnect_task_class');
+
+               // Register it
+               $handlerInstance->registerTask('self_connect', $taskInstance);
+
+               // Prepare a update-check task
+               $taskInstance = ObjectFactory::createObjectByConfiguredName('hub_update_check_task_class');
+
+               // Register it
+               $handlerInstance->registerTask('update_check', $taskInstance);
+
+               // Get the list instance here
+               $listInstance = $nodeInstance->getListenerPoolInstance()->getPoolEntriesInstance();
+
+               // Prepare a ping task
+               $taskInstance = ObjectFactory::createObjectByConfiguredName('hub_ping_task_class', array($listInstance));
+
+               // Register it
+               $handlerInstance->registerTask('ping', $taskInstance);
        }
 }