Added wrapper, rewrites:

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

diff --git a/application/hub/config.php b/application/hub/config.php
index a4a0aed29f2acfd0f899048746c6f0e88fed3b53..853c88b02edd6307ecdfd68964b575a2897f5499 100644 (file)
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -48,6 +48,9 @@ $cfg->setConfigEntry('debug_class', 'DebugConsoleOutput');
 // CFG: NODE-INFO-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('node_info_db_wrapper_class', 'NodeInformationDatabaseWrapper');
 
+// CFG: NODE-DHT-DB-WRAPPER-CLASS
+$cfg->setConfigEntry('node_dht_db_wrapper_class', 'NodeDistributedHashTableDatabaseWrapper');
+
 // CFG: PEER-LOOKUP-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('peer_state_lookup_db_wrapper_class', 'PeerStateLookupDatabaseWrapper');
 
@@ -69,11 +72,11 @@ $cfg->setConfigEntry('tcp_listener_class', 'TcpListener');
 // CFG: UDP-LISTENER-CLASS
 $cfg->setConfigEntry('udp_listener_class', 'UdpListener');
 
-// CFG: HUB-TCP-LISTENER-CLASS
-$cfg->setConfigEntry('hub_tcp_listener_class', 'HubTcpListenerDecorator');
+// CFG: NODE-TCP-LISTENER-CLASS
+$cfg->setConfigEntry('node_tcp_listener_class', 'HubTcpListenerDecorator');
 
-// CFG: HUB-UDP-LISTENER-CLASS
-$cfg->setConfigEntry('hub_udp_listener_class', 'HubUdpListenerDecorator');
+// CFG: NODE-UDP-LISTENER-CLASS
+$cfg->setConfigEntry('node_udp_listener_class', 'HubUdpListenerDecorator');
 
 // CFG: CLIENT-TCP-LISTENER-CLASS
 $cfg->setConfigEntry('client_tcp_listener_class', 'ClientTcpListenerDecorator');
@@ -123,11 +126,11 @@ $cfg->setConfigEntry('node_raw_data_monitor_visitor_class', 'RawDataPoolMonitorV
 // CFG: LIST-GROUP-CLASS
 $cfg->setConfigEntry('list_group_class', 'ListGroupList');
 
-// CFG: HUB-ANNOUNCEMENT-HELPER-CLASS
-$cfg->setConfigEntry('hub_announcement_helper_class', 'HubAnnouncementHelper');
+// CFG: NODE-ANNOUNCEMENT-HELPER-CLASS
+$cfg->setConfigEntry('node_announcement_helper_class', 'HubAnnouncementHelper');
 
-// CFG: HUB-SELF-CONNECT-HELPER-CLASS
-$cfg->setConfigEntry('hub_self_connect_helper_class', 'HubSelfConnectHelper');
+// CFG: NODE-SELF-CONNECT-HELPER-CLASS
+$cfg->setConfigEntry('node_self_connect_helper_class', 'HubSelfConnectHelper');
 
 // CFG: DEFAULT-CONSOLE-COMMAND
 $cfg->setConfigEntry('default_console_command', 'main');
@@ -156,8 +159,8 @@ $cfg->setConfigEntry('node_initializer_filter', 'NodeInitializationFilter');
 // CFG: NODE-ACTIVATION-TASK-HANDLER-INITIALIZER-FILTER
 $cfg->setConfigEntry('node_activation_task_handler_initializer_filter', 'NodeTaskHandlerInitializerFilter');
 
-// CFG: NODE-ACTIVATION-SELF-ANNOUNCEMENT-TASK-FILTER
-$cfg->setConfigEntry('node_activation_self_announcement_task_filter', 'NodeActivationSelfAnnouncementFilter');
+// CFG: NODE-ACTIVATION-ANNOUNCEMENT-TASK-FILTER
+$cfg->setConfigEntry('node_activation_announcement_task_filter', 'NodeActivationAnnouncementFilter');
 
 // CFG: NODE-WELCOME-TEASER-FILTER
 $cfg->setConfigEntry('node_welcome_teaser_filter', 'NodeWelcomeTeaserFilter');
@@ -171,9 +174,6 @@ $cfg->setConfigEntry('node_bootstrap_generate_sessionid_filter', 'NodeBootstrapG
 // CFG: NODE-BOOTSTRAP-GENERATE-PRIVATE-KEY-FILTER
 $cfg->setConfigEntry('node_bootstrap_generate_private_key_filter', 'NodeBootstrapGeneratePrivateKeyFilter');
 
-// CFG: NODE-BOOTSTRAP-INIT-QUEUES-FILTER
-$cfg->setConfigEntry('node_bootstrap_init_queues_filter', 'NodeBootstrapInitQueuesFilter');
-
 // CFG: NODE-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER
 $cfg->setConfigEntry('node_bootstrap_extra_bootstrapping_filter', 'NodeBootstrapExtraBootstrappingFilter');
 
@@ -183,9 +183,6 @@ $cfg->setConfigEntry('node_bootstrap_listener_pool_filter', 'NodeBootstrapListen
 // CFG: NODE-SHUTDOWN-FLUSH-NODE-LIST-FILTER
 $cfg->setConfigEntry('node_shutdown_flush_node_list_filter', 'NodeShutdownFlushNodeListFilter');
 
-// CFG: NODE-SHUTDOWN-DEINIT-QUEUES-FILTER
-$cfg->setConfigEntry('node_shutdown_deinit_queues_filter', 'NodeShutdownDeinitQueuesFilter');
-
 // CFG: NODE-SHUTDOWN-TASK-HANDLER-FILTER
 $cfg->setConfigEntry('node_shutdown_task_handler_filter', 'NodeShutdownTaskHandlerFilter');
 
@@ -447,14 +444,14 @@ $cfg->setConfigEntry('task_self_connect_interval_delay', 1000*60*30);
 // CFG: TASK-SELF-CONNECT-MAX-RUNS
 $cfg->setConfigEntry('task_self_connect_max_runs', 0);
 
-// CFG: TASK-SELF-ANNOUNCEMENT-STARTUP-DELAY
-$cfg->setConfigEntry('task_self_announcement_startup_delay', 10000);
+// CFG: TASK-ANNOUNCEMENT-STARTUP-DELAY
+$cfg->setConfigEntry('task_announcement_startup_delay', 10000);
 
-// CFG: TASK-SELF-ANNOUNCEMENT-INTERVAL-DELAY
-$cfg->setConfigEntry('task_self_announcement_interval_delay', 1000);
+// CFG: TASK-ANNOUNCEMENT-INTERVAL-DELAY
+$cfg->setConfigEntry('task_announcement_interval_delay', 1000);
 
-// CFG: TASK-SELF-ANNOUNCEMENT-MAX-RUNS
-$cfg->setConfigEntry('task_self_announcement_max_runs', 1);
+// CFG: TASK-ANNOUNCEMENT-MAX-RUNS
+$cfg->setConfigEntry('task_announcement_max_runs', 1);
 
 // CFG: TASK-UPDATE-CHECK-STARTUP-DELAY
 $cfg->setConfigEntry('task_update_check_startup_delay', 1000*60*60*6);
@@ -477,32 +474,41 @@ $cfg->setConfigEntry('task_ping_max_runs', 0);
 // CFG: IDLE-TASK-CLASS
 $cfg->setConfigEntry('idle_task_class', 'IdleLoopTask');
 
-// CFG: HUB-SELFCONNECT-TASK-CLASS
-$cfg->setConfigEntry('hub_selfconnect_task_class', 'HubSelfConnectTask');
+// CFG: NODE-SELFCONNECT-TASK-CLASS
+$cfg->setConfigEntry('node_selfconnect_task_class', 'NodeSelfConnectTask');
+
+// CFG: NODE-UPDATE-CHECK-TASK-CLASS
+$cfg->setConfigEntry('node_update_check_task_class', 'NodeUpdateCheckTask');
 
-// CFG: HUB-UPDATE-CHECK-TASK-CLASS
-$cfg->setConfigEntry('hub_update_check_task_class', 'HubUpdateCheckTask');
+// CFG: NODE-PING-TASK-CLASS
+$cfg->setConfigEntry('node_ping_task_class', 'NodePingTask');
 
-// CFG: HUB-PING-TASK-CLASS
-$cfg->setConfigEntry('hub_ping_task_class', 'HubPingTask');
+// CFG: NODE-ANNOUNCEMENT-TASK-CLASS
+$cfg->setConfigEntry('node_announcement_task_class', 'NodeAnnouncementTask');
 
-// CFG: HUB-SELF-ANNOUNCEMENT-TASK-CLASS
-$cfg->setConfigEntry('hub_self_announcement_task_class', 'HubSelfAnnouncementTask');
+// CFG: NODE-PACKAGE-WRITER-TASK-CLASS
+$cfg->setConfigEntry('node_package_writer_task_class', 'NetworkPackageWriterTask');
 
-// CFG: HUB-PACKAGE-WRITER-TASK-CLASS
-$cfg->setConfigEntry('hub_package_writer_task_class', 'NetworkPackageWriterTask');
+// CFG: NODE-PACKAGE-READER-TASK-CLASS
+$cfg->setConfigEntry('node_package_reader_task_class', 'NetworkPackageReaderTask');
 
-// CFG: HUB-PACKAGE-READER-TASK-CLASS
-$cfg->setConfigEntry('hub_package_reader_task_class', 'NetworkPackageReaderTask');
+// CFG: NODE-SOCKET-LISTENER-TASK-CLASS
+$cfg->setConfigEntry('node_socket_listener_task_class', 'NodeSocketListenerTask');
 
-// CFG: HUB-SOCKET-LISTENER-TASK-CLASS
-$cfg->setConfigEntry('hub_socket_listener_task_class', 'HubSocketListenerTask');
+// CFG: NODE-CHUNK-ASSEMBLER-TASK-CLASS
+$cfg->setConfigEntry('node_chunk_assembler_task_class', 'NodeChunkAssemblerTask');
 
-// CFG: HUB-CHUNK-ASSEMBLER-TASK-CLASS
-$cfg->setConfigEntry('hub_chunk_assembler_task_class', 'HubChunkAssemblerTask');
+// CFG: NODE-PACKAGE-DECODER-TASK-CLASS
+$cfg->setConfigEntry('node_package_decoder_task_class', 'NodePackageDecoderTask');
 
-// CFG: HUB-PACKAGE-DECODER-TASK-CLASS
-$cfg->setConfigEntry('hub_package_decoder_task_class', 'HubPackageDecoderTask');
+// CFG: NODE-DHT-INIT-TASK-CLASS
+$cfg->setConfigEntry('node_dht_init_task_class', 'NodeDhtInitializationTask');
+
+// CFG: NODE-DHT-BOOTSTRAP-TASK-CLASS
+$cfg->setConfigEntry('node_dht_bootstrap_task_class', 'NodeDhtBootstrapTask');
+
+// CFG: NODE-DHT-QUERY-TASK-CLASS
+$cfg->setConfigEntry('node_dht_query_task_class', 'NodeDhtQueryTask');
 
 // CFG: TASK-NETWORK-PACKAGE-WRITER-STARTUP-DELAY
 $cfg->setConfigEntry('task_network_package_writer_startup_delay', 2500);
@@ -531,23 +537,50 @@ $cfg->setConfigEntry('task_socket_listener_interval_delay', 10);
 // CFG: TASK-SOCKET-LISTENER-MAX-RUNS
 $cfg->setConfigEntry('task_socket_listener_max_runs', 0);
 
-// CFG: TASK-CHUNK-ASSEMBLER-STATUP-DELAY
-$cfg->setConfigEntry('task_chunk_assembler_startup_delay', 1500);
-
 // CFG: TASK-PACKAGE-DECODER-STATUP-DELAY
 $cfg->setConfigEntry('task_package_decoder_startup_delay', 1300);
 
-// CFG: TASK-CHUNK-ASSEMBLER-INTERVAL-DELAY
-$cfg->setConfigEntry('task_chunk_assembler_interval_delay', 10);
-
 // CFG: TASK-PACKAGE-DECODER-INTERVAL-DELAY
-$cfg->setConfigEntry('task_package_decoder_interval_delay', 10);
+$cfg->setConfigEntry('task_package_decoder_interval_delay', 50);
+
+// CFG: TASK-PACKAGE-DECODER-MAX-RUNS
+$cfg->setConfigEntry('task_package_decoder_max_runs', 0);
+
+// CFG: TASK-CHUNK-ASSEMBLER-STATUP-DELAY
+$cfg->setConfigEntry('task_chunk_assembler_startup_delay', 1500);
+
+// CFG: TASK-CHUNK-ASSEMBLER-INTERVAL-DELAY
+$cfg->setConfigEntry('task_chunk_assembler_interval_delay', 50);
 
 // CFG: TASK-CHUNK-ASSEMBLER-MAX-RUNS
 $cfg->setConfigEntry('task_chunk_assembler_max_runs', 0);
 
-// CFG: TASK-PACKAGE-DECODER-MAX-RUNS
-$cfg->setConfigEntry('task_package_decoder_max_runs', 0);
+// CFG: TASK-DHT-INIT-STATUP-DELAY
+$cfg->setConfigEntry('task_dht_init_startup_delay', 100);
+
+// CFG: TASK-DHT-INIT-INTERVAL-DELAY
+$cfg->setConfigEntry('task_dht_init_interval_delay', 86400000); // = 1 day (won't matter anyway)
+
+// CFG: TASK-DHT-INIT-MAX-RUNS
+$cfg->setConfigEntry('task_dht_init_max_runs', 1);
+
+// CFG: TASK-DHT-BOOTSTRAP-STATUP-DELAY
+$cfg->setConfigEntry('task_dht_bootstrap_startup_delay', 100);
+
+// CFG: TASK-DHT-BOOTSTRAP-INTERVAL-DELAY
+$cfg->setConfigEntry('task_dht_bootstrap_interval_delay', 3600000); // = 1 hour (won't matter anyway)
+
+// CFG: TASK-DHT-BOOTSTRAP-MAX-RUNS
+$cfg->setConfigEntry('task_dht_bootstrap_max_runs', 1);
+
+// CFG: TASK-DHT-QUERY-STATUP-DELAY
+$cfg->setConfigEntry('task_dht_query_startup_delay', 1400);
+
+// CFG: TASK-DHT-QUERY-INTERVAL-DELAY
+$cfg->setConfigEntry('task_dht_query_interval_delay', 50);
+
+// CFG: TASK-DHT-QUERY-MAX-RUNS
+$cfg->setConfigEntry('task_dht_query_max_runs', 0);
 
 // CFG: TASK-LIST-CLASS
 $cfg->setConfigEntry('task_list_class', 'TaskList');
@@ -564,8 +597,8 @@ $cfg->setConfigEntry('default_iterator_class', 'DefaultIterator');
 // CFG: QUERY-ITERATOR-CLASS
 $cfg->setConfigEntry('query_iterator_class', 'DefaultIterator');
 
-// CFG: HUB-PING-ITERATOR-CLASS
-$cfg->setConfigEntry('hub_ping_iterator_class', 'HubPingIterator');
+// CFG: NODE-PING-ITERATOR-CLASS
+$cfg->setConfigEntry('node_ping_iterator_class', 'HubPingIterator');
 
 // CFG: LOCAL-QUERY-LIST-CLASS
 $cfg->setConfigEntry('local_query_list_class', 'LocalQueryList');
@@ -707,8 +740,8 @@ $cfg->setConfigEntry('package_decoder_class', 'PackageDecoder');
 // @TODO This is very static, rewrite it to more flexible
 $cfg->setConfigEntry('package_recipient_max_count', 3);
 
-// CFG: NODE-DHT-CLASS
-$cfg->setConfigEntry('node_dht_class', 'NodeDhtFacade');
+// CFG: DHT-CLASS
+$cfg->setConfigEntry('dht_class', 'NodeDhtFacade');
 
 ///////////////////////////////////////////////////////////////////////////////
 //                              Peer states