From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 10 Apr 2012 08:56:10 +0000 (+0000)
Subject: - mod
X-Git-Tag: initial-import-from-subversion-38251~13973
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=16349a2370933c25901ecca6f19bea3ad1208783;p=oweals%2Fgnunet.git

- mod
---

diff --git a/src/integration-tests/connection_watchdog.c b/src/integration-tests/connection_watchdog.c
index 7cb8810c8..fb2d1067d 100644
--- a/src/integration-tests/connection_watchdog.c
+++ b/src/integration-tests/connection_watchdog.c
@@ -164,15 +164,6 @@ int stats_check_cb (void *cls, const char *subsystem,
            transport_connections, statistics_transport_connections);
       fail = GNUNET_YES;
     }
-
-    if (transport_connections != statistics_transport_tcp_connections)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-           "Transport connections are inconsistent: %u transport notifications <-> %u in statistics (statistics_transport_tcp_connections)\n",
-           transport_connections, statistics_transport_tcp_connections);
-      fail = GNUNET_YES;
-    }
-
     if (core_connections != statistics_core_entries_session_map)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -193,6 +184,20 @@ int stats_check_cb (void *cls, const char *subsystem,
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
          "Statistics consistency check successful : (%u transport / %u core) connections established\n", transport_connections, core_connections);
 
+    /* This is only an issue when transport_connections > statistics_transport_tcp_connections */
+    if (transport_connections > statistics_transport_tcp_connections)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+           "Transport connections are inconsistent: %u transport notifications <-> %u in statistics (statistics_transport_tcp_connections)\n",
+           transport_connections, statistics_transport_tcp_connections);
+      fail = GNUNET_YES;
+    }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+           "Transport connections are inconsistent: %u transport notifications <-> %u in statistics (statistics_transport_tcp_connections)\n",
+           transport_connections, statistics_transport_tcp_connections);
+    }
 
     if (GNUNET_SCHEDULER_NO_TASK == statistics_task)
       statistics_task = GNUNET_SCHEDULER_add_delayed(REPEATED_STATS_DELAY, &stats_check, NULL);
@@ -522,7 +527,7 @@ main (int argc, char *const *argv)
     GNUNET_GETOPT_OPTION_END
   };
   return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc, argv, "gnunet-template",
+          GNUNET_PROGRAM_run (argc, argv, "connection-watchdog",
                               gettext_noop ("help text"), options, &run,
                               NULL)) ? ret : 1;
 }