Fix reconnecting in certain cases by adding ldap.UNAVILABLE

spaceone · spaceone · commit 48edd062ef57 · 2023-07-01T19:01:46.000+02:00
diff --git a/Lib/ldap/ldapobject.py b/Lib/ldap/ldapobject.py
@@ -820,8 +820,7 @@ def get_naming_contexts(self):
 class ReconnectLDAPObject(SimpleLDAPObject):
   """
   :py:class:`SimpleLDAPObject` subclass whose synchronous request methods
-  automatically reconnect and re-try in case of server failure
-  (:exc:`ldap.SERVER_DOWN`).
+  automatically reconnect and re-try in case of server failure.
 
   The first arguments are same as for the :py:func:`~ldap.initialize()`
   function.
@@ -833,6 +832,11 @@ class ReconnectLDAPObject(SimpleLDAPObject):
   * retry_delay: specifies the time in seconds between reconnect attempts.
 
   This class also implements the pickle protocol.
+
+  .. versionadded:: 4.0
+    The exceptions which cause a re-connection are now configurable via :py:attr:`_reconnect_exceptions`.
+    The exceptions :py:exc:`ldap.UNAVAILABLE`, :py:exc:`ldap.CONNECT_ERROR` and
+    :py:exc:`ldap.TIMEOUT` now also trigger a reconnect.
   """
 
   __transient_attrs__ = {
@@ -842,6 +846,7 @@ class ReconnectLDAPObject(SimpleLDAPObject):
     '_reconnect_lock',
     '_last_bind',
   }
+  _reconnect_exceptions = (ldap.SERVER_DOWN, ldap.UNAVAILABLE, ldap.CONNECT_ERROR, ldap.TIMEOUT)
 
   def __init__(
     self,uri,
@@ -970,7 +975,7 @@ def _apply_method_s(self,func,*args,**kwargs):
     self.reconnect(self._uri,retry_max=self._retry_max,retry_delay=self._retry_delay,force=False)
     try:
       return func(self,*args,**kwargs)
-    except ldap.SERVER_DOWN:
+    except self._reconnect_exceptions:
       # Try to reconnect
       self.reconnect(self._uri,retry_max=self._retry_max,retry_delay=self._retry_delay,force=True)
       # Re-try last operation
