Changeset 1170

Timestamp:

10/24/03 10:37:55 (21 years ago)

Author:

jalet

Message:

More complete messages in case of LDAP failure.
LDAP database connection is now unbound on exit too.

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/storages/ldapstorage.py (modified) (6 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.16alpha1 :
+    
+        - Ensures that the LDAP connection is really closed at end.
+        
+        - More complete error messages in case of LDAP operation failure.
+        
     - 1.15 :
      

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.34  2003/10/24 08:37:55  jalet
+# More complete messages in case of LDAP failure.
+# LDAP database connection is now unbound on exit too.
+#
 # Revision 1.33  2003/10/08 07:01:20  jalet
 # Job history can be disabled.
@@ -176 +180 @@
         """Closes the database connection."""
         if not self.closed :
-            del self.database
+            self.database.unbind_s()
             self.closed = 1
             self.tool.logdebug("Database closed.")
@@ -205 +209 @@
             self.tool.logdebug("QUERY : Filter : %s, BaseDN : %s, Scope : %s, Attributes : %s" % (key, base, scope, fields))
             result = self.database.search_s(base or self.basedn, scope, key, fields)
-        except ldap.LDAPError :    
-            raise PyKotaStorageError, _("Search for %s(%s) from %s(scope=%s) returned no answer.") % (key, fields, base, scope)
+        except ldap.LDAPError, msg :    
+            raise PyKotaStorageError, (_("Search for %s(%s) from %s(scope=%s) returned no answer.") % (key, fields, base, scope)) + " : %s" % str(msg)
         else :     
             self.tool.logdebug("QUERY : Result : %s" % result)
@@ -216 +220 @@
             self.tool.logdebug("QUERY : ADD(%s, %s)" % (dn, str(fields)))
             self.database.add_s(dn, modlist.addModlist(fields))
-        except ldap.LDAPError :
-            raise PyKotaStorageError, _("Problem adding LDAP entry (%s, %s)") % (dn, str(fields))
+        except ldap.LDAPError, msg :
+            raise PyKotaStorageError, (_("Problem adding LDAP entry (%s, %s)") % (dn, str(fields))) + " : %s" % str(msg)
         else :
             return dn
@@ -226 +230 @@
             self.tool.logdebug("QUERY : Delete(%s)" % dn)
             self.database.delete_s(dn)
-        except ldap.LDAPError :
-            raise PyKotaStorageError, _("Problem deleting LDAP entry (%s)") % dn
+        except ldap.LDAPError, msg :
+            raise PyKotaStorageError, (_("Problem deleting LDAP entry (%s)") % dn) + " : %s" % str(msg)
             
     def doModify(self, dn, fields, ignoreold=1) :
@@ -235 +239 @@
             self.tool.logdebug("QUERY : Modify(%s, %s ==> %s)" % (dn, oldentry[0][1], fields))
             self.database.modify_s(dn, modlist.modifyModlist(oldentry[0][1], fields, ignore_oldexistent=ignoreold))
-        except ldap.LDAPError :
-            raise PyKotaStorageError, _("Problem modifying LDAP entry (%s, %s)") % (dn, fields)
+        except ldap.LDAPError, msg :
+            raise PyKotaStorageError, (_("Problem modifying LDAP entry (%s, %s)") % (dn, fields)) + " : %s" % str(msg)
         else :
             return dn

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.15_unofficial"
+__version__ = "1.16alpha1_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""