From: Matthias Wachs <wachs@net.in.tum.de>
Date: Wed, 2 Jul 2014 07:39:27 +0000 (+0000)
Subject: tracking down connection exceeded issue
X-Git-Tag: initial-import-from-subversion-38251~3538
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=13c92b1966accce020a6a5d3f90b252c55a4ad2f;p=oweals%2Fgnunet.git

tracking down connection exceeded issue
---

diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index cf75ec5d7..e996c70c5 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -553,7 +553,7 @@ client_schedule (struct HTTP_Client_Plugin *plugin,
   mret = curl_multi_fdset (plugin->curl_multi_handle, &rs, &ws, &es, &max);
   if (mret != CURLM_OK)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("%s failed at %s:%d: `%s'\n"),
+    LOG (GNUNET_ERROR_TYPE_ERROR, _("%s failed at %s:%d: `%s'\n"),
                 "curl_multi_fdset", __FILE__, __LINE__,
                 curl_multi_strerror (mret));
     return GNUNET_SYSERR;
@@ -568,7 +568,7 @@ client_schedule (struct HTTP_Client_Plugin *plugin,
 
   if (mret != CURLM_OK)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+    LOG (GNUNET_ERROR_TYPE_ERROR,
                 _("%s failed at %s:%d: `%s'\n"),
                 "curl_multi_timeout", __FILE__, __LINE__,
                 curl_multi_strerror (mret));
@@ -1319,6 +1319,9 @@ curl_easy_getinfo (easy_h,
           curl_easy_cleanup (easy_h);
           GNUNET_assert (plugin->cur_connections > 0);
           plugin->cur_connections--;
+          LOG  (GNUNET_ERROR_TYPE_INFO,
+              "PUT request done, number of connections decreased to %u\n",
+              plugin->cur_connections);
           s->put_tmp_disconnecting = GNUNET_NO;
           s->put_tmp_disconnected = GNUNET_YES;
           s->put.easyhandle = NULL;
@@ -1366,6 +1369,9 @@ curl_easy_getinfo (easy_h,
           /* FIXME: who calls curl_multi_remove on 'easy_h' now!? */
           GNUNET_assert (plugin->cur_connections > 0);
           plugin->cur_connections--;
+          LOG  (GNUNET_ERROR_TYPE_INFO,
+              "GET request done, number of connections decreased to %u\n",
+              plugin->cur_connections);
 	  /* If we are emulating an XHR client we need to make another GET
 	   * request.
 	   */
@@ -1487,6 +1493,9 @@ client_connect_get (struct Session *s)
     return GNUNET_SYSERR;
   }
   s->plugin->cur_connections++;
+  LOG  (GNUNET_ERROR_TYPE_INFO,
+      "GET request `%s' established, number of connections increased to %u\n",
+      s->url, s->plugin->cur_connections);
   return GNUNET_OK;
 }
 
@@ -1586,7 +1595,9 @@ client_connect_put (struct Session *s)
   }
   s->put_tmp_disconnected = GNUNET_NO;
   s->plugin->cur_connections++;
-
+  LOG  (GNUNET_ERROR_TYPE_INFO,
+      "PUT request `%s' established, number of connections increased to %u\n",
+      s->url, s->plugin->cur_connections);
   return GNUNET_OK;
 }
 
@@ -1730,6 +1741,7 @@ http_client_plugin_get_session (void *cls,
   if (NULL != s)
     return s;
 
+  /* create a new session */
   if (plugin->max_connections <= plugin->cur_connections)
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,