Refactured handling of socket errors, old code is commeted out and will be removed...

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

diff --git a/application/hub/config.php b/application/hub/config.php
index a7de9c2232fb3bee1ecd9ac2a58e123fe2e66eab..345abce40158e2e6ecaf94b8763b2ca31614292d 100644 (file)
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -22,7 +22,7 @@
  */
 
 // Some hub-specific configuration like port hostname where we will listen, etc.
-$cfg = FrameworkConfiguration::getInstance();
+$cfg = FrameworkConfiguration::getSelfInstance();
 
 // CFG: NODE-LISTEN-ADDR
 $cfg->setConfigEntry('node_listen_addr', '0.0.0.0');
@@ -429,12 +429,6 @@ $cfg->setConfigEntry('query_iterator_class', 'DefaultIterator');
 // CFG: HUB-PING-ITERATOR-CLASS
 $cfg->setConfigEntry('hub_ping_iterator_class', 'HubPingIterator');
 
-// CFG: TEST-UNIT-PRODUCER-KEY-ITERATOR-CLASS
-$cfg->setConfigEntry('test_unit_producer_key_iterator_class', 'TestUnitKeyProducerIterator');
-
-// CFG: WORK-UNIT-PRODUCER-KEY-ITERATOR-CLASS
-$cfg->setConfigEntry('work_unit_producer_key_iterator_class', 'WorkUnitKeyProducerIterator');
-
 // CFG: LOCAL-QUERY-LIST-CLASS
 $cfg->setConfigEntry('local_query_list_class', 'LocalQueryList');
 
@@ -522,6 +516,9 @@ $cfg->setConfigEntry('node_raw_data_output_stream_class', 'RawDataOutputStream')
 // CFG: NODE-RAW-DATA-INPUT-STREAM-CLASS
 $cfg->setConfigEntry('node_raw_data_input_stream_class', 'RawDataInputStream');
 
+// CFG: DEBUG-OUTPUT-TIMINGS
+$cfg->setConfigEntry('debug_output_timings', 'Y');
+
 ///////////////////////////////////////////////////////////////////////////////
 //                              Peer states
 ///////////////////////////////////////////////////////////////////////////////
@@ -535,6 +532,9 @@ $cfg->setConfigEntry('peer_connected_state_class', 'ConnectedPeerState');
 // CFG: PEER-CONNECTION-REFUSED-STATE-CLASS
 $cfg->setConfigEntry('peer_connection_refused_state_class', 'ConnectionRefusedPeerState');
 
+// CFG: PEER-CONNECTION-TIMED-OUT-STATE-CLASS
+$cfg->setConfigEntry('peer_connection_timed_out_state_class', 'ConnectionTimedOutPeerState');
+
 // CFG: PEER-TRANSPORT-ENDPOINT-STATE-CLASS
 $cfg->setConfigEntry('peer_transport_endpoint_state_class', 'TransportEndpointGonePeerState');
 
@@ -653,6 +653,12 @@ $cfg->setConfigEntry('cruncher_unit_db_wrapper_class', 'CruncherUnitDatabaseWrap
 // CFG: CRUNCHER-RANDOM-SECRET-MESSAGE-LENGTH
 $cfg->setConfigEntry('random_secret_message_length', 100);
 
+// CFG: TEST-UNIT-PRODUCER-KEY-ITERATOR-CLASS
+$cfg->setConfigEntry('test_unit_producer_key_iterator_class', 'TestUnitKeyProducerIterator');
+
+// CFG: WORK-UNIT-PRODUCER-KEY-ITERATOR-CLASS
+$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);
 
@@ -702,6 +708,18 @@ $cfg->setConfigEntry('chat_bootstrap_generic_activation_filter', 'ChatBootstrapG
 // CFG: CHAT-SHUTDOWN-FILTER
 $cfg->setConfigEntry('chat_shutdown_filter', 'ChatShutdownFilter');
 
+// CFG: CHAT-TELNET-LISTENER-TASK-CLASS
+$cfg->setConfigEntry('chat_telnet_listener_task_class', 'ChatTelnetListenerTask');
+
+// CFG: TASK-CHAT-TELNET-LISTENER-STARTUP-DELAY
+$cfg->setConfigEntry('task_chat_telnet_listener_startup_delay', 2500);
+
+// CFG: TASK-CHAT-TELNET-LISTENER-INTERVAL-DELAY
+$cfg->setConfigEntry('task_chat_telnet_listener_interval_delay', 10);
+
+// CFG: TASK-CHAT-TELNET-LISTENER-MAX-RUNS
+$cfg->setConfigEntry('task_chat_telnet_listener_max_runs', 0);
+
 ///////////////////////////////////////////////////////////////////////////////
 //                            HTTP Configuration
 ///////////////////////////////////////////////////////////////////////////////