- Adjusted logging level, testing parameters

diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index d420b29faad65b2ffe00f7bd5f668b631fe68860..d7a3d8ac1a34317e152adaf3d9426520a6b3d449 100644 (file)
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -65,7 +65,7 @@ CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
 DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
+MAX_CONCURRENT_SSH = 20
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 TOPOLOGY_OUTPUT_FILE = 2dtorus_topo_initial
@@ -77,7 +77,7 @@ MAX_OUTSTANDING_CONNECTIONS = 75
 DELETE_FILES = YES
 
 [test_dht_topo]
-CONNECTION_LIMIT = 16
+CONNECTION_LIMIT = 20
 #DATA_OUTPUT_FILE=data_output
 
 

diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c
index 81dc7cb854c7e92e5c2013ec2405e1842fd7263e..cb0399da96ebf691ff2302f6e3c386d2000d3710 100644 (file)
--- a/src/dht/test_dht_topo.c
+++ b/src/dht/test_dht_topo.c
@@ -145,17 +145,12 @@ shutdown_callback (void *cls, const char *emsg)
 {
   if (emsg != NULL)
   {
-#if VERBOSE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n");
-#endif
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Shutdown of peers failed!\n");
     ok++;
   }
   else
   {
-#if VERBOSE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "All peers successfully shut down!\n");
-#endif
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "All peers successfully shut down!\n");
   }
   GNUNET_CONFIGURATION_destroy (testing_cfg);
 }
@@ -164,9 +159,7 @@ shutdown_callback (void *cls, const char *emsg)
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n");
-#endif
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Ending test.\n");
 
   if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
   {
@@ -185,7 +178,7 @@ disconnect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   unsigned int i;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "disconnecting peers\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "disconnecting peers\n");
   disconnect_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_SCHEDULER_cancel (put_task);
   if (NULL != get_h)
@@ -313,7 +306,7 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   {
     GNUNET_assert (0);
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_task\ntest:   from %s\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_task\nfrom %s\n",
               GNUNET_h2s_full (&o->id.hashPubKey));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  looking for %s\n",
               GNUNET_h2s_full (&d->id.hashPubKey));
@@ -474,7 +467,7 @@ connect_cb (void *cls, const struct GNUNET_PeerIdentity *first,
   }
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Problem with new connection (%s)\n", emsg);
   }