[CalendarServer-changes] [15113] twext/trunk/twext/who/ldap/_service.py

[source_changes at macosforge.org]

Revision: 15113
          http://trac.calendarserver.org//changeset/15113
Author:   sagen at apple.com
Date:     2015-09-09 13:29:30 -0700 (Wed, 09 Sep 2015)
Log Message:
-----------
Make LDAP retry count configurable

Modified Paths:
--------------
    twext/trunk/twext/who/ldap/_service.py

Modified: twext/trunk/twext/who/ldap/_service.py
===================================================================
--- twext/trunk/twext/who/ldap/_service.py	2015-09-09 20:08:38 UTC (rev 15112)
+++ twext/trunk/twext/who/ldap/_service.py	2015-09-09 20:29:30 UTC (rev 15113)
@@ -233,6 +233,7 @@
         ownThreadpool=True,
         threadPoolMax=10,
         connectionMax=10,
+        tries=3,
         _debug=False,
     ):
         """
@@ -278,6 +279,7 @@
         self._credentials = credentials
         self._timeout = timeout
         self._extraFilters = extraFilters
+        self._tries = tries
 
         if tlsCACertificateFile is None:
             self._tlsCACertificateFile = None
@@ -602,15 +604,12 @@
         """
         This method is always called in a thread.
         """
-
         if recordTypes is None:
             recordTypes = list(self.recordTypes())
 
         # Retry if we get ldap.SERVER_DOWN
-        TRIES = 3
+        for self._retryNumber in xrange(self._tries):
 
-        for self._retryNumber in xrange(TRIES):
-
             records = []
 
             try:
@@ -710,8 +709,8 @@
                 self.log.error(
                     "LDAP server unavailable"
                 )
-                if self._retryNumber + 1 == TRIES:
-                    # We've hit SERVER_DOWN TRIES times, giving up
+                if self._retryNumber + 1 == self._tries:
+                    # We've hit SERVER_DOWN self._tries times, giving up
                     raise LDAPQueryError("LDAP server down", e)
                 else:
                     self.log.error("LDAP connection failure; retrying...")
@@ -748,10 +747,8 @@
         records = []
 
         # Retry if we get ldap.SERVER_DOWN
-        TRIES = 3
+        for self._retryNumber in xrange(self._tries):
 
-        for self._retryNumber in xrange(TRIES):
-
             try:
 
                 with DirectoryService.Connection(self) as connection:
@@ -776,8 +773,8 @@
                 self.log.error(
                     "LDAP server unavailable"
                 )
-                if self._retryNumber + 1 == TRIES:
-                    # We've hit SERVER_DOWN TRIES times, giving up
+                if self._retryNumber + 1 == self._tries:
+                    # We've hit SERVER_DOWN self._tries times, giving up
                     raise LDAPQueryError("LDAP server down", e)
                 else:
                     self.log.error("LDAP connection failure; retrying...")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150909/a254e276/attachment.html>