X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fconfig.php;h=d63a50b4c5af09ee9293e9ca93f4922b6467ed62;hb=9a1243bea20f7602ef7cdfe912a7db5ee958fba8;hp=151722b01105cc505256c52f6de7a1118adaf6d8;hpb=8d02a735a5d3fc9c67962308a20fc9d7c18bdaf1;p=hub.git

diff --git a/application/hub/config.php b/application/hub/config.php
index 151722b01..d63a50b4c 100644
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -27,11 +27,8 @@ $cfg = FrameworkConfiguration::getSelfInstance();
 // CFG: NODE-LISTEN-ADDR
 $cfg->setConfigEntry('node_listen_addr', '0.0.0.0');
 
-// CFG: NODE-TCP-LISTEN-PORT
-$cfg->setConfigEntry('node_tcp_listen_port', 9060);
-
-// CFG: NODE-UDP-LISTEN-PORT
-$cfg->setConfigEntry('node_udp_listen_port', 9060);
+// CFG: NODE-LISTEN-PORT
+$cfg->setConfigEntry('node_listen_port', 9060);
 
 // CFG: NODE-DEFAULT-MODE (can be 'regular', 'list', 'master' or 'boot', default is 'regular')
 $cfg->setConfigEntry('node_default_mode', 'regular');
@@ -48,18 +45,18 @@ $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: NODE-DHT-LIST-LIMIT
+$cfg->setConfigEntry('node_dht_list_limit', 20);
+
 // CFG: PEER-LOOKUP-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('peer_state_lookup_db_wrapper_class', 'PeerStateLookupDatabaseWrapper');
 
 // CFG: WEB-CONTENT-TYPE
 $cfg->setConfigEntry('web_content_type', '');
 
-// CFG: QUERY-CONNECTOR-CLASS
-$cfg->setConfigEntry('query_connector_class', 'LocalQueryConnector');
-
-// CFG: QUEUE-CONNECTOR-CLASS
-$cfg->setConfigEntry('queue_connector_class', 'LocalQueueConnector');
-
 // CFG: LISTENER-POOL-CLAS
 $cfg->setConfigEntry('listener_pool_class', 'DefaultListenerPool');
 
@@ -124,10 +121,13 @@ $cfg->setConfigEntry('node_raw_data_monitor_visitor_class', 'RawDataPoolMonitorV
 $cfg->setConfigEntry('list_group_class', 'ListGroupList');
 
 // CFG: NODE-ANNOUNCEMENT-HELPER-CLASS
-$cfg->setConfigEntry('node_announcement_helper_class', 'HubAnnouncementHelper');
+$cfg->setConfigEntry('node_announcement_helper_class', 'NodeAnnouncementHelper');
 
 // CFG: NODE-SELF-CONNECT-HELPER-CLASS
-$cfg->setConfigEntry('node_self_connect_helper_class', 'HubSelfConnectHelper');
+$cfg->setConfigEntry('node_self_connect_helper_class', 'NodeSelfConnectHelper');
+
+// CFG: DHT-BOOTSTRAP-HELPER-CLASS
+$cfg->setConfigEntry('dht_bootstrap_helper_class', 'DhtBootstrapHelper');
 
 // CFG: DEFAULT-CONSOLE-COMMAND
 $cfg->setConfigEntry('default_console_command', 'main');
@@ -246,9 +246,15 @@ $cfg->setConfigEntry('node_request_node_list_answer_template_class', 'XmlRequest
 // CFG: NODE-REQUEST-NODE-LIST-ENTRIES-TEMPLATE-CLASS
 $cfg->setConfigEntry('node_request_node_list_entries_template_class', 'XmlRequestNodeListEntryTemplateEngine');
 
+// CFG: DHT-BOOTSTRAP-TEMPLATE-CLASS
+$cfg->setConfigEntry('dht_bootstrap_template_class', 'XmlDhtBootstrapTemplateEngine');
+
 // CFG: NODE-MESSAGE-TEMPLATE-EXTENSION
 $cfg->setConfigEntry('node_message_template_extension', '.xml');
 
+// CFG: DHT-MESSAGE-TEMPLATE-EXTENSION
+$cfg->setConfigEntry('dht_message_template_extension', '.xml');
+
 // CFG: NODE-ANNOUNCEMENT-ANSWER-TEMPLATE-EXTENSION
 $cfg->setConfigEntry('node_announcement_answer_template_extension', '.xml');
 
@@ -303,6 +309,9 @@ $cfg->setConfigEntry('node_object_registry_stacker_class', 'FiLoStacker');
 // CFG: NODE-OBJECT-TYPE-REGISTRY-CLASS
 $cfg->setConfigEntry('node_object_type_registry_class', 'ObjectTypeRegistry');
 
+// CFG: DHT-BOOTSTRAP-TEMPLATE-TYPE
+$cfg->setConfigEntry('dht_bootstrap_template_type', 'xml/dht_bootstrap');
+
 // CFG: CODE-TEMPLATE-TYPE
 $cfg->setConfigEntry('code_template_type', 'xml');
 
@@ -318,6 +327,9 @@ $cfg->setConfigEntry('node_raw_data_stacker_class', 'FiFoStacker');
 // CFG: CHUNK-HANDLER-STACKER-CLASS
 $cfg->setConfigEntry('chunk_handler_stacker_class', 'FiFoStacker');
 
+// CFG: DHT-BOOTSTRAP-STACKER-CLASS
+$cfg->setConfigEntry('dht_bootstrap_stacker_class', 'FiFoStacker');
+
 // CFG: PRODUCER-OUTGOING-QUEUE
 $cfg->setConfigEntry('producer_outgoing_queue', 'FiFoStacker');
 
@@ -369,21 +381,9 @@ $cfg->setConfigEntry('stacker_package_processed_message_max_size', 400);
 // CFG: STACKER-PACKAGE-BACKBUFFER-MAX-SIZE
 $cfg->setConfigEntry('stacker_package_backbuffer_max_size', 1000);
 
-// CFG: STACKER-IN-QUEUE-MAX-SIZE
-$cfg->setConfigEntry('stacker_in_queue_max_size', 10000);
-
-// CFG: STACKER-OUT-QUEUE-MAX-SIZE
-$cfg->setConfigEntry('stacker_out_queue_max_size', 10000);
-
 // CFG: STACKER-NODE-OBJECT-REGISTRY-MAX-SIZE
 $cfg->setConfigEntry('stacker_node_object_registry_max_size', 100);
 
-// CFG: STACKER-OUTGOING-QUEUE-MAX-SIZE
-$cfg->setConfigEntry('stacker_outgoing_queue_max_size', 100000);
-
-// CFG: STACKER-INCOMING-QUEUE-MAX-SIZE
-$cfg->setConfigEntry('stacker_incoming_queue_max_size', 100000);
-
 // CFG: STACKER-RAW-DATA-MAX-SIZE
 $cfg->setConfigEntry('stacker_raw_data_max_size', 100);
 
@@ -399,29 +399,23 @@ $cfg->setConfigEntry('stacker_chunk_raw_data_max_size', 100);
 // CFG: STACKER-DECODED-PACKAGE-MAX-SIZE
 $cfg->setConfigEntry('stacker_decoded_package_max_size', 100);
 
+// CFG: STACKER-DHT-BOOTSTRAP-MAX-SIZE
+$cfg->setConfigEntry('stacker_dht_bootstrap_max_size', 10);
+
 // CFG: NEWS-MAIN-LIMIT
 $cfg->setConfigEntry('news_main_limit', 5);
 
 // CFG: TASK-HANDLER-CLASS
 $cfg->setConfigEntry('task_handler_class', 'TaskHandler');
 
-// CFG: TASK-QUERY-HANDLER-STARTUP-DELAY
-$cfg->setConfigEntry('task_query_handler_startup_delay', 1000);
+// CFG: TASK-PACKAGE-TAGS-INIT-STARTUP-DELAY
+$cfg->setConfigEntry('task_package_tags_init_startup_delay', 50);
 
-// CFG: TASK-QUERY-HANDLER-INTERVAL-DELAY
-$cfg->setConfigEntry('task_query_handler_interval_delay', 10);
+// CFG: TASK-PACKAGE-TAGS-INIT-INTERVAL-DELAY
+$cfg->setConfigEntry('task_package_tags_init_interval_delay', 1000*60*60*24*7);
 
-// CFG: TASK-QUERY-HANDLER-MAX-RUNS
-$cfg->setConfigEntry('task_query_handler_max_runs', 0);
-
-// CFG: TASK-QUEUE-HANDLER-STARTUP-DELAY
-$cfg->setConfigEntry('task_queue_handler_startup_delay', 1000);
-
-// CFG: TASK-QUEUE-HANDLER-INTERVAL-DELAY
-$cfg->setConfigEntry('task_queue_handler_interval_delay', 10);
-
-// CFG: TASK-QUEUE-HANDLER-MAX-RUNS
-$cfg->setConfigEntry('task_queue_handler_max_runs', 0);
+// 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);
@@ -471,6 +465,9 @@ $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');
+
 // CFG: NODE-SELFCONNECT-TASK-CLASS
 $cfg->setConfigEntry('node_selfconnect_task_class', 'NodeSelfConnectTask');
 
@@ -498,6 +495,9 @@ $cfg->setConfigEntry('node_chunk_assembler_task_class', 'NodeChunkAssemblerTask'
 // CFG: NODE-PACKAGE-DECODER-TASK-CLASS
 $cfg->setConfigEntry('node_package_decoder_task_class', 'NodePackageDecoderTask');
 
+// 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');
 
@@ -549,11 +549,20 @@ $cfg->setConfigEntry('task_chunk_assembler_interval_delay', 50);
 // CFG: TASK-CHUNK-ASSEMBLER-MAX-RUNS
 $cfg->setConfigEntry('task_chunk_assembler_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
+$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);
@@ -585,33 +594,9 @@ $cfg->setConfigEntry('query_iterator_class', 'DefaultIterator');
 // CFG: NODE-PING-ITERATOR-CLASS
 $cfg->setConfigEntry('node_ping_iterator_class', 'HubPingIterator');
 
-// CFG: LOCAL-QUERY-LIST-CLASS
-$cfg->setConfigEntry('local_query_list_class', 'LocalQueryList');
-
-// CFG: LOCAL-QUERY-CLASS
-$cfg->setConfigEntry('local_query_class', 'LocalQuery');
-
 // CFG: WEB-TEMPLATE-CLASS @OVERRIDE
 $cfg->setConfigEntry('web_template_class', 'ConsoleTemplateEngine');
 
-// CFG: NODE-INIT-STATE-CLASS
-$cfg->setConfigEntry('node_init_state_class', 'NodeInitState');
-
-// CFG: NODE-VIRGIN-STATE-CLASS
-$cfg->setConfigEntry('node_virgin_state_class', 'NodeVirginState');
-
-// CFG: NODE-ACTIVE-STATE-CLASS
-$cfg->setConfigEntry('node_active_state_class', 'NodeActiveState');
-
-// CFG: NODE-ANNOUNCED-STATE-CLASS
-$cfg->setConfigEntry('node_announced_state_class', 'NodeAnnouncedState');
-
-// CFG: NODE-REACHABLE-STATE-CLASS
-$cfg->setConfigEntry('node_reachable_state_class', 'NodeReachableState');
-
-// CFG: NODE-ANNOUNCEMENT-COMPLETED-STATE-CLASS
-$cfg->setConfigEntry('node_announcement_completed_state_class', 'NodeAnnouncementCompletedState');
-
 // CFG: NETWORK-PACKAGE-CLASS
 $cfg->setConfigEntry('network_package_class', 'NetworkPackage');
 
@@ -725,8 +710,30 @@ $cfg->setConfigEntry('package_decoder_class', 'PackageDecoder');
 // @TODO This is very static, rewrite it to more flexible
 $cfg->setConfigEntry('package_recipient_max_count', 3);
 
-// CFG: DHT-CLASS
-$cfg->setConfigEntry('dht_class', 'NodeDhtFacade');
+// CFG: NODE-DHT-CLASS
+$cfg->setConfigEntry('node_dht_class', 'NodeDhtFacade');
+
+///////////////////////////////////////////////////////////////////////////////
+//                              Node states
+///////////////////////////////////////////////////////////////////////////////
+
+// CFG: NODE-INIT-STATE-CLASS
+$cfg->setConfigEntry('node_init_state_class', 'NodeInitState');
+
+// CFG: NODE-VIRGIN-STATE-CLASS
+$cfg->setConfigEntry('node_virgin_state_class', 'NodeVirginState');
+
+// CFG: NODE-ACTIVE-STATE-CLASS
+$cfg->setConfigEntry('node_active_state_class', 'NodeActiveState');
+
+// CFG: NODE-ANNOUNCED-STATE-CLASS
+$cfg->setConfigEntry('node_announced_state_class', 'NodeAnnouncedState');
+
+// CFG: NODE-REACHABLE-STATE-CLASS
+$cfg->setConfigEntry('node_reachable_state_class', 'NodeReachableState');
+
+// CFG: NODE-ANNOUNCEMENT-COMPLETED-STATE-CLASS
+$cfg->setConfigEntry('node_announcement_completed_state_class', 'NodeAnnouncementCompletedState');
 
 ///////////////////////////////////////////////////////////////////////////////
 //                              Peer states
@@ -756,6 +763,22 @@ $cfg->setConfigEntry('peer_operation_already_progress_state_class', 'OperationAl
 // CFG: PEER-NO-ROUTE-TO-HOST-STATE-CLASS
 $cfg->setConfigEntry('peer_no_route_to_host_state_class', 'NoRouteToHostPeerState');
 
+///////////////////////////////////////////////////////////////////////////////
+//                               DHT states
+///////////////////////////////////////////////////////////////////////////////
+
+// CFG: DHT-INIT-STATE-CLASS
+$cfg->setConfigEntry('dht_init_state_class', 'DhtInitState');
+
+// CFG: DHT-VIRGIN-STATE-CLASS
+$cfg->setConfigEntry('dht_virgin_state_class', 'DhtVirginState');
+
+// CFG: DHT-BOOTING-STATE-CLASS
+$cfg->setConfigEntry('dht_booting_state_class', 'DhtBootingState');
+
+// CFG: DHT-ACTIVE-STATE-CLASS
+$cfg->setConfigEntry('dht_active_state_class', 'DhtActiveState');
+
 ///////////////////////////////////////////////////////////////////////////////
 //                       Message answer-status handler
 ///////////////////////////////////////////////////////////////////////////////
@@ -766,6 +789,22 @@ $cfg->setConfigEntry('announcement_answer_status_okay_handler_class', 'Announcem
 // CFG: REQUEST-NODE-LIST-ANSWER-STATUS-OKAY-HANDLER-CLASS
 $cfg->setConfigEntry('request_node_list_answer_status_okay_handler_class', 'RequestNodeListAnswerOkayHandler');
 
+///////////////////////////////////////////////////////////////////////////////
+//                          Recipient resolver
+///////////////////////////////////////////////////////////////////////////////
+
+// CFG: DIRECT-RECIPIENT-CLASS
+$cfg->setConfigEntry('direct_recipient_class', 'DirectRecipient');
+
+// CFG: DHT-RECIPIENT-CLASS
+$cfg->setConfigEntry('dht_recipient_class', 'DhtRecipient');
+
+// CFG: SELF-RECIPIENT-CLASS
+$cfg->setConfigEntry('self_recipient_class', 'SelfRecipient');
+
+// CFG: UPPER-RECIPIENT-CLASS
+$cfg->setConfigEntry('upper_recipient_class', 'UpperRecipient');
+
 ///////////////////////////////////////////////////////////////////////////////
 //                        Cruncher configuration
 ///////////////////////////////////////////////////////////////////////////////