# HG changeset patch # User Sylvain Thénault # Date 1289566046 -3600 # Node ID 65bd93b72f1ed013a1ba58200b273bfeaee0f1d3 # Parent bbc3f7c9f8d9bebdc1d527173f975ed6ce51414e [ldap] make instance still usable if we can't contact ldap server diff -r bbc3f7c9f8d9 -r 65bd93b72f1e server/sources/ldapuser.py --- a/server/sources/ldapuser.py Fri Nov 05 18:48:07 2010 +0100 +++ b/server/sources/ldapuser.py Fri Nov 12 13:47:26 2010 +0100 @@ -369,8 +369,14 @@ try: results = self._query_cache[rqlkey] except KeyError: - results = self.rqlst_search(session, rqlst, args) - self._query_cache[rqlkey] = results + try: + results = self.rqlst_search(session, rqlst, args) + self._query_cache[rqlkey] = results + except ldap.SERVER_DOWN: + # cant connect to server + msg = session._("can't connect to source %s, some data may be missing") + session.set_shared_data('sources_error', msg % self.uri) + return [] return results def rqlst_search(self, session, rqlst, args):