[checkmk-commits] LDAP discovery: Continue with origin connection ( the one made with the origin server address) when discovery fails

Module: check_mk Branch: master Commit: 3fdf8d8bbeb8630aefbb007a1dc905b1f6a4fbe0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fdf8d8bbeb863… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 29 16:56:04 2017 +0200 LDAP discovery: Continue with origin connection (the one made with the origin server address) when discovery fails Change-Id: Id306f772e5aacc683ba8e8dad7d9a749220ebf59 --- web/plugins/userdb/ldap.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 4fb8dee..046412f 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -298,9 +298,10 @@ class LDAPUserConnector(UserConnector): continue except Exception, e: - self.log(' DISCOVERY: Failed to detect server from %r' % server) + self.log(' DISCOVERY: Failed to discover a better server than %r' % server) log_exception() - raise + self.log(' DISCOVERY: Try to continue with origin connection') + break # got a connection! # Got no connection to any server if self._ldap_obj is None: