Fix/improve error reporting

This commit is contained in:
Benjamin Renard 2018-02-13 15:30:38 +01:00
parent 0f69b2a713
commit a525bd586b

View file

@ -23,7 +23,7 @@ class LdapServer(object):
def _error(self,error,level=logging.WARNING): def _error(self,error,level=logging.WARNING):
if self.raiseOnError: if self.raiseOnError:
raise LdapServerException('LdapServer - Error connecting and binding to LDAP server : %s' % error) raise LdapServerException(error)
else: else:
logging.log(level,error) logging.log(level,error)
@ -67,7 +67,7 @@ class LdapServer(object):
self.con.add_s(dn,ldif) self.con.add_s(dn,ldif)
return True return True
except ldap.LDAPError, e: except ldap.LDAPError, e:
self._error("LdapServer - Error adding %s : %s" % (dn,e)) self._error("LdapServer - Error adding %s : %s" % (dn,e), logging.error)
return False return False
@ -79,7 +79,7 @@ class LdapServer(object):
self.con.modify_s(dn,ldif) self.con.modify_s(dn,ldif)
return True return True
except ldap.LDAPError, e: except ldap.LDAPError, e:
self._error("LdapServer - Error updating %s : %s\nOld : %s\nNew : %s" % (dn, e, old, new)) self._error("LdapServer - Error updating %s : %s\nOld : %s\nNew : %s" % (dn, e, old, new), logging.error)
return False return False
def rename_object(self,dn,new_rdn): def rename_object(self,dn,new_rdn):
@ -88,7 +88,7 @@ class LdapServer(object):
self.con.rename_s(dn,new_rdn) self.con.rename_s(dn,new_rdn)
return True return True
except ldap.LDAPError, e: except ldap.LDAPError, e:
self._error("LdapServer - Error renaming %s in %s : %s" % (dn,new_rdn,e)) self._error("LdapServer - Error renaming %s in %s : %s" % (dn,new_rdn,e), logging.error)
return False return False
@ -98,7 +98,7 @@ class LdapServer(object):
self.con.delete_s(dn) self.con.delete_s(dn)
return True return True
except ldap.LDAPError, e: except ldap.LDAPError, e:
self._error("LdapServer - Error deleting %s : %s" % (dn,e)) self._error("LdapServer - Error deleting %s : %s" % (dn,e), logging.error)
return False return False