Patch for an Issue Issue #416

stamparm · stamparm · commit 2ada9e9b8486 · 2013-03-04T18:05:40.000+01:00
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -101,6 +101,7 @@
 from lib.core.settings import IS_WIN
 from lib.core.settings import LOCALHOST
 from lib.core.settings import MAXDB_ALIASES
+from lib.core.settings import MAX_CONNECT_RETRIES
 from lib.core.settings import MAX_NUMBER_OF_THREADS
 from lib.core.settings import MSSQL_ALIASES
 from lib.core.settings import MYSQL_ALIASES
@@ -1431,6 +1432,9 @@ def _cleanupOptions():
     else:
         kb.adjustTimeDelay = ADJUST_TIME_DELAY.DISABLE
 
+    if conf.retries:
+        conf.retries = min(conf.retries, MAX_CONNECT_RETRIES)
+
     if conf.code:
         conf.code = int(conf.code)
 
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -490,6 +490,9 @@
 # Maximum length of a help part containing switch/option name(s)
 MAX_HELP_OPTION_LENGTH = 18
 
+# Maximum number of connection retries (to prevent problems with recursion)
+MAX_CONNECT_RETRIES = 100
+
 # Strings for detecting formatting errors
 FORMAT_EXCEPTION_STRINGS = ("Type mismatch", "Error converting", "Failed to convert", "System.FormatException", "java.lang.NumberFormatException")
 
