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

source_changes at macosforge.org source_changes at macosforge.org
Thu Sep 11 13:19:51 PDT 2014


Revision: 13951
          http://trac.calendarserver.org//changeset/13951
Author:   sagen at apple.com
Date:     2014-09-11 13:19:50 -0700 (Thu, 11 Sep 2014)
Log Message:
-----------
Don't just ignore "server down" and generic LDAP exceptions.

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

Modified: twext/trunk/twext/who/ldap/_service.py
===================================================================
--- twext/trunk/twext/who/ldap/_service.py	2014-09-11 20:19:21 UTC (rev 13950)
+++ twext/trunk/twext/who/ldap/_service.py	2014-09-11 20:19:50 UTC (rev 13951)
@@ -623,10 +623,10 @@
                     )
                     s.processResults()
 
-                except ldap.SIZELIMIT_EXCEEDED, e:
+                except ldap.SIZELIMIT_EXCEEDED as e:
                     self.log.debug("LDAP result limit exceeded: {}".format(limitResults,))
 
-                except ldap.TIMELIMIT_EXCEEDED, e:
+                except ldap.TIMELIMIT_EXCEEDED as e:
                     self.log.warn("LDAP timeout exceeded: {} seconds".format(timeoutSeconds,))
 
                 except ldap.FILTER_ERROR as e:
@@ -640,25 +640,25 @@
                     # self.log.warn("RDN {rdn} does not exist, skipping", rdn=rdn)
                     continue
 
-                except ldap.INVALID_SYNTAX, e:
+                except ldap.INVALID_SYNTAX as e:
                     self.log.error(
                         "LDAP invalid syntax {query!r}: {err}",
                         query=queryString, err=e
                     )
                     continue
 
-                except ldap.SERVER_DOWN:
+                except ldap.SERVER_DOWN as e:
                     self.log.error(
                         "LDAP server unavailable"
                     )
-                    continue
+                    raise LDAPQueryError("LDAP server down", e)
 
-                except Exception, e:
+                except Exception as e:
                     self.log.error(
                         "LDAP error {query!r}: {err}",
                         query=queryString, err=e
                     )
-                    continue
+                    raise LDAPQueryError("Unable to perform query", e)
 
                 reply = [resultItem for resultType, resultItem in s.allResults]
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140911/b3a33ace/attachment.html>


More information about the calendarserver-changes mailing list