Added also here ...

[hub.git] / application / hub / config.php

diff --git a/application/hub/config.php b/application/hub/config.php
index e718837aa6f90000849d31c90ceaf5a798dfaff4..c464598599b8fafedfb0b36ffab9e025f9871864 100644 (file)
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -102,18 +102,12 @@ $cfg->setConfigEntry('udp_raw_data_handler_class', 'UdpRawDataHandler');
 // CFG: SHUTDOWN-LISTENER-POOL-VISITOR-CLASS
 $cfg->setConfigEntry('shutdown_listener_pool_visitor_class', 'ShutdownListenerPoolVisitor');
 
-// CFG: SHUTDOWN-TASK-VISITOR-CLASS
-$cfg->setConfigEntry('shutdown_task_visitor_class', 'ShutdownTaskVisitor');
-
 // CFG: SHUTDOWN-SOCKET-VISITOR-CLASS
 $cfg->setConfigEntry('shutdown_socket_visitor_class', 'ShutdownSocketVisitor');
 
 // CFG: HALF-SHUTDOWN-SOCKET-VISITOR-CLASS
 $cfg->setConfigEntry('half_shutdown_socket_visitor_class', 'HalfShutdownSocketVisitor');
 
-// CFG: ACTIVE-TASK-VISITOR-CLASS
-$cfg->setConfigEntry('active_task_visitor_class', 'ActiveTaskVisitor');
-
 // CFG: NODE-RAW-DATA-MONITOR-VISITOR-CLASS
 $cfg->setConfigEntry('node_raw_data_monitor_visitor_class', 'RawDataPoolMonitorVisitor');
 
@@ -132,11 +126,11 @@ $cfg->setConfigEntry('dht_publish_entry_helper_class', 'DhtPublishEntryHelper');
 // CFG: DEFAULT-CONSOLE-COMMAND
 $cfg->setConfigEntry('default_console_command', 'main');
 
-// CFG: DEFAULT-HUBCONSOLE-COMMAND
-$cfg->setConfigEntry('default_hubconsole_command', 'main');
+// CFG: DEFAULT-HUB-CONSOLE-COMMAND
+$cfg->setConfigEntry('default_hub_console_command', 'main');
 
-// CFG: HUBCONSOLE-CMD-MAIN-RESOLVER-CLASS
-$cfg->setConfigEntry('hubconsole_cmd_main_resolver_class', 'HubConsoleCommandResolver');
+// CFG: HUB-CONSOLE-CMD-MAIN-RESOLVER-CLASS
+$cfg->setConfigEntry('hub_console_cmd_main_resolver_class', 'HubConsoleCommandResolver');
 
 // CFG: NETWORK-STATE-RESOLVER-CLASS
 $cfg->setConfigEntry('network_state_resolver_class', 'NetworkStateResolver');
@@ -243,8 +237,8 @@ $cfg->setConfigEntry('node_answer_message_dht_bootstrap_helper_class', 'NodeDhtB
 // CFG: NODE-NEXT-ANNOUNCEMENT-ANSWER-OKAY-HELPER-CLASS
 $cfg->setConfigEntry('node_next_announcement_answer_okay_helper_class', 'NodeRequestNodeListHelper');
 
-// CFG: NEWS-READER-CLASS
-$cfg->setConfigEntry('news_reader_class', 'ConsoleNewsReader');
+// CFG: NEWS-READER-MAIN-CLASS
+$cfg->setConfigEntry('news_reader_main_class', 'ConsoleNewsReader');
 
 // CFG: NODE-ANNOUNCEMENT-TEMPLATE-CLASS
 $cfg->setConfigEntry('node_announcement_template_class', 'XmlAnnouncementTemplateEngine');
@@ -483,15 +477,6 @@ $cfg->setConfigEntry('task_package_tags_init_interval_delay', 1000*60*60*24*7);
 // CFG: TASK-PACKAGE-TAGS-INIT-MAX-RUNS
 $cfg->setConfigEntry('task_package_tags_init_max_runs', 1);
 
-// CFG: TASK-IDLE-LOOP-STARTUP-DELAY
-$cfg->setConfigEntry('task_idle_loop_startup_delay', 0);
-
-// CFG: TASK-IDLE-LOOP-INTERVAL-DELAY
-$cfg->setConfigEntry('task_idle_loop_interval_delay', 0);
-
-// CFG: TASK-IDLE-LOOP-MAX-RUNS
-$cfg->setConfigEntry('task_idle_loop_max_runs', 0);
-
 // CFG: TASK-SELF-CONNECT-STARTUP-DELAY
 $cfg->setConfigEntry('task_self_connect_startup_delay', 4000);
 
@@ -528,9 +513,6 @@ $cfg->setConfigEntry('task_ping_interval_delay', 1000*60*60);
 // CFG: TASK-PING-MAX-RUNS
 $cfg->setConfigEntry('task_ping_max_runs', 0);
 
-// CFG: IDLE-TASK-CLASS
-$cfg->setConfigEntry('idle_task_class', 'IdleLoopTask');
-
 // CFG: NODE-PACKAGE-TAGS-INIT-TASK-CLASS
 $cfg->setConfigEntry('node_package_tags_init_task_class', 'NodePackageTagsInitTask');
 
@@ -833,6 +815,9 @@ $cfg->setConfigEntry('max_dht_recipients', 10);
 // CFG: CONNECTION-INFO-CLASS
 $cfg->setConfigEntry('connection_info_class', 'ConnectionInfo');
 
+// CFG: DEFAULT-HUB-CONSOLE-CONTROLLER
+$cfg->setConfigEntry('default_hub_console_controller', 'main');
+
 ///////////////////////////////////////////////////////////////////////////////
 //                              Node states
 ///////////////////////////////////////////////////////////////////////////////
@@ -935,8 +920,8 @@ $cfg->setConfigEntry('miner_default_mode', 'chash');
 // CFG: MINER-BUFFER-STACKER-CLASS
 $cfg->setConfigEntry('miner_buffer_stacker_class', 'FiFoStacker');
 
-// CFG: HUBCONSOLE-CMD-CRUNCHER-RESOLVER-CLASS
-$cfg->setConfigEntry('hubconsole_cmd_miner_resolver_class', 'HubConsoleCommandResolver');
+// CFG: HUB-CONSOLE-CMD-CRUNCHER-RESOLVER-CLASS
+$cfg->setConfigEntry('hub_console_cmd_miner_resolver_class', 'HubConsoleCommandResolver');
 
 // CFG: MINER-PHP-REQUIREMENTS-FILTER
 $cfg->setConfigEntry('miner_php_requirements_filter', 'MinerPhpRequirementsFilter');
@@ -984,13 +969,25 @@ $cfg->setConfigEntry('task_miner_block_fetcher_max_runs', 0);
 $cfg->setConfigEntry('miner_test_genesis_block_producer_task_class', 'MinerTestGenesisBlockProducerTask');
 
 // CFG: TASK-MINER-TEST-GENESIS-BLOCK-PRODUCER-STARTUP-DELAY
-$cfg->setConfigEntry('task_miner_test_genesis_block_producer_startup_delay', 500);
+$cfg->setConfigEntry('task_miner_test_genesis_block_producer_startup_delay', 1000);
 
 // CFG: TASK-MINER-TEST-GENESIS-BLOCK-PRODUCER-INTERVAL-DELAY
-$cfg->setConfigEntry('task_miner_test_genesis_block_producer_interval_delay', 1000*60*60);
+$cfg->setConfigEntry('task_miner_test_genesis_block_producer_interval_delay', 10000);
 
 // CFG: TASK-MINER-TEST-GENESIC-BLOCK-PRODUCER-MAX-RUNS
-$cfg->setConfigEntry('task_miner_test_genesis_block_producer_max_runs', 1);
+$cfg->setConfigEntry('task_miner_test_genesis_block_producer_max_runs', 0);
+
+// CFG: MINER-REAL-GENESIS-BLOCK-PRODUCER-TASK-CLASS
+$cfg->setConfigEntry('miner_real_genesis_block_producer_task_class', 'MinerRealGenesisBlockProducerTask');
+
+// CFG: TASK-MINER-REAL-GENESIS-BLOCK-PRODUCER-STARTUP-DELAY
+$cfg->setConfigEntry('task_miner_real_genesis_block_producer_startup_delay', 500);
+
+// CFG: TASK-MINER-REAL-GENESIS-BLOCK-PRODUCER-INTERVAL-DELAY
+$cfg->setConfigEntry('task_miner_real_genesis_block_producer_interval_delay', 10000);
+
+// CFG: TASK-MINER-REAL-GENESIC-BLOCK-PRODUCER-MAX-RUNS
+$cfg->setConfigEntry('task_miner_real_genesis_block_producer_max_runs', 0);
 
 // CFG: MINER_NODE-COMMUNICATOR-TASK-CLASS
 $cfg->setConfigEntry('miner_node_communicator_task_class', 'MinerNodeCommunicatorTask');
@@ -1007,12 +1004,18 @@ $cfg->setConfigEntry('task_miner_node_communicator_max_runs', 0);
 // CFG: MINER-TEST-GENESIS-BLOCK-PRODUCER-CLASS
 $cfg->setConfigEntry('miner_test_genesis_block_producer_class', 'MinerTestGenesisBlockProducer');
 
+// CFG: MINER-REAL-GENESIS-BLOCK-PRODUCER-CLASS
+$cfg->setConfigEntry('miner_real_genesis_block_producer_class', 'MinerRealGenesisBlockProducer');
+
 // CFG: MINER-NODE-COMMUNICATOR-CLASS
 $cfg->setConfigEntry('miner_node_communicator_class', 'MinerNodeCommunicator');
 
 // CFG: MINER-TEST-HASH-BLOCK-CLASS
 $cfg->setConfigEntry('miner_test_hash_block_class', 'HashBlock');
 
+// CFG: MINER-REAL-HASH-BLOCK-CLASS
+$cfg->setConfigEntry('miner_real_hash_block_class', 'HashBlock');
+
 ///////////////////////////////////////////////////////////////////////////////
 //                        Cruncher configuration
 ///////////////////////////////////////////////////////////////////////////////
@@ -1023,8 +1026,8 @@ $cfg->setConfigEntry('cruncher_default_mode', 'mcrypt');
 // CFG: CRUNCHER-BUFFER-STACKER-CLASS
 $cfg->setConfigEntry('cruncher_buffer_stacker_class', 'FiFoStacker');
 
-// CFG: HUBCONSOLE-CMD-CRUNCHER-RESOLVER-CLASS
-$cfg->setConfigEntry('hubconsole_cmd_cruncher_resolver_class', 'HubConsoleCommandResolver');
+// CFG: HUB-CONSOLE-CMD-CRUNCHER-RESOLVER-CLASS
+$cfg->setConfigEntry('hub_console_cmd_cruncher_resolver_class', 'HubConsoleCommandResolver');
 
 // CFG: CRUNCHER-PHP-REQUIREMENTS-FILTER
 $cfg->setConfigEntry('cruncher_php_requirements_filter', 'CruncherPhpRequirementsFilter');
@@ -1141,7 +1144,7 @@ $cfg->setConfigEntry('test_unit_producer_key_iterator_class', 'TestUnitKeyProduc
 $cfg->setConfigEntry('work_unit_producer_key_iterator_class', 'WorkUnitKeyProducerIterator');
 
 // CFG: TEST-UNIT-RANDOM-SECRET-KEY-LENGTH
-$cfg->setConfigEntry('test_unit_random_secret_key_length', 8*4);
+$cfg->setConfigEntry('test_unit_random_secret_key_length', 8 * 32);
 
 // CFG: TEST-UNIT-SOURCE-CLASS
 $cfg->setConfigEntry('test_unit_source_class', 'TestUnitSource');
@@ -1162,8 +1165,8 @@ $cfg->setConfigEntry('cruncher_per_unit_key_limit', 1000);
 //                            Chat Configuration
 ///////////////////////////////////////////////////////////////////////////////
 
-// CFG: HUBCONSOLE-CMD-CHAT-RESOLVER-CLASS
-$cfg->setConfigEntry('hubconsole_cmd_chat_resolver_class', 'HubConsoleCommandResolver');
+// CFG: HUB-CONSOLE-CMD-CHAT-RESOLVER-CLASS
+$cfg->setConfigEntry('hub_console_cmd_chat_resolver_class', 'HubConsoleCommandResolver');
 
 // CFG: CHAT-PHP-REQUIREMENTS-FILTER
 $cfg->setConfigEntry('chat_php_requirements_filter', 'ChatPhpRequirementsFilter');
@@ -1214,8 +1217,8 @@ $cfg->setConfigEntry('file_stacks_extension', 'stack');
 // CFG: INDEX-EXTENSION
 $cfg->setConfigEntry('index_extension', '.idx');
 
-// CFG: HUBCONSOLE-CMD-CHAT-RESOLVER-CLASS
-$cfg->setConfigEntry('hubconsole_cmd_crawler_resolver_class', 'HubConsoleCommandResolver');
+// CFG: HUB-CONSOLE-CMD-CHAT-RESOLVER-CLASS
+$cfg->setConfigEntry('hub_console_cmd_crawler_resolver_class', 'HubConsoleCommandResolver');
 
 // CFG: CRAWLER-PHP-REQUIREMENTS-FILTER
 $cfg->setConfigEntry('crawler_php_requirements_filter', 'CrawlerPhpRequirementsFilter');
@@ -1495,8 +1498,8 @@ $cfg->setConfigEntry('news_home_limit', 10);
 //                         Apt-Proxy Configuration
 ///////////////////////////////////////////////////////////////////////////////
 
-// CFG: HUBCONSOLE-CMD-APT-PROXY-RESOLVER-CLASS
-$cfg->setConfigEntry('hubconsole_cmd_apt_proxy_resolver_class', 'HubConsoleCommandResolver');
+// CFG: HUB-CONSOLE-CMD-APT-PROXY-RESOLVER-CLASS
+$cfg->setConfigEntry('hub_console_cmd_apt_proxy_resolver_class', 'HubConsoleCommandResolver');
 
 // CFG: APT-PROXY-PHP-REQUIREMENTS-FILTER
 $cfg->setConfigEntry('apt_proxy_php_requirements_filter', 'AptProxyPhpRequirementsFilter');