Changeset 1523

Timestamp:

06/06/04 00:18:04 (20 years ago)

Author:

jalet

Message:

Now catches some exceptions earlier.
storage.py and ldapstorage.py : removed old comments

Location:

pykota/trunk/pykota

Files:

• storage.py (modified) (2 diffs)
• storages/ldapstorage.py (modified) (2 diffs)
• tool.py (modified) (2 diffs)

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.55  2004/06/05 22:18:04  jalet
+# Now catches some exceptions earlier.
+# storage.py and ldapstorage.py : removed old comments
+#
 # Revision 1.54  2004/06/05 22:03:49  jalet
 # Payments history is now stored in database
@@ -515 +519 @@
 class BaseStorage :
     def __init__(self, pykotatool) :
-        """Opens the LDAP connection."""
-        # raise PyKotaStorageError, "Sorry, the LDAP backend for PyKota is not yet implemented !"
+        """Opens the storage connection."""
         self.closed = 1
         self.tool = pykotatool

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.69  2004/06/05 22:18:04  jalet
+# Now catches some exceptions earlier.
+# storage.py and ldapstorage.py : removed old comments
+#
 # Revision 1.68  2004/06/05 22:03:50  jalet
 # Payments history is now stored in database
@@ -275 +279 @@
     def __init__(self, pykotatool, host, dbname, user, passwd) :
         """Opens the LDAP connection."""
-        # raise PyKotaStorageError, "Sorry, the LDAP backend for PyKota is not yet implemented !"
         BaseStorage.__init__(self, pykotatool)
         self.info = pykotatool.config.getLDAPInfo()

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.96  2004/06/05 22:18:04  jalet
+# Now catches some exceptions earlier.
+# storage.py and ldapstorage.py : removed old comments
+#
 # Revision 1.95  2004/06/03 21:50:34  jalet
 # Improved error logging.
@@ -399 +403 @@
         self.smtpserver = self.config.getSMTPServer()
         self.maildomain = self.config.getMailDomain()
-        self.logger = logger.openLogger(self.config.getLoggingBackend())
-        self.storage = storage.openConnection(self)
+        try :
+            self.logger = logger.openLogger(self.config.getLoggingBackend())
+            self.storage = storage.openConnection(self)
+        except (logger.PyKotaLoggingError, storage.PyKotaStorageError), msg :
+            self.crashed(msg)
+            raise
         self.softwareJobSize = 0
         self.softwareJobPrice = 0.0