fixing nasty bug caused by retrying counter

stamparm · stamparm · commit 40971aca9471 · 2011-05-22T10:59:56.000Z
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -102,10 +102,15 @@ def getPage(**kwargs):
         response = kwargs.get('response',           False)
         ignoreTimeout = kwargs.get('ignoreTimeout', kb.ignoreTimeout)
         refreshing = kwargs.get('refreshing',       False)
+        retrying = kwargs.get('retrying',           False)
 
         # flag to know if we are dealing with the same target host
         target = reduce(lambda x, y: x == y, map(lambda x: urlparse.urlparse(x).netloc.split(':')[0], [url, conf.url]))
 
+        if not retrying:
+            # Reset the number of connection retries
+            threadData.retriesCount = 0
+
         # fix for known issue when urllib2 just skips the other part of provided
         # url splitted with space char while urlencoding it in the later phase
         url = url.replace(" ", "%20")
@@ -270,9 +275,6 @@ def getPage(**kwargs):
 
                 conf.redirectHandled = True
 
-            # Reset the number of connection retries
-            threadData.retriesCount = 0
-
             # Return response object
             if response:
                 return conn, None
@@ -425,9 +427,10 @@ def getPage(**kwargs):
                 time.sleep(1)
 
                 socket.setdefaulttimeout(conf.timeout)
+                kwargs['retrying'] = True
                 return Connect.__getPageProxy(**kwargs)
             elif kb.testMode:
-                logger.warn(warnMsg)
+                logger.critical(warnMsg)
                 return None, None
             else:
                 socket.setdefaulttimeout(conf.timeout)
