Changeset 1379

Timestamp:

02/22/07 09:22:46 (6 years ago)

Author:

mglb1

Message:

• Move database connection establishment into a separate function.
• Reconnect whenever 'serious' database connection errors occur

File:

• ccsd/trunk/crcnetd/_utils/ccsd_session.py (modified) (6 diffs)

ccsd/trunk/crcnetd/_utils/ccsd_session.py

@@ -78 +78 @@
         self.mode = mode
         self.lock = threading.RLock()
-        
+        self.db = None
+
         # Session Time Records
         if initiated == -1:
@@ -95 +96 @@
             self.token = token
         
-        # Setup a database connection  
-        self.db = PgSQL.connect(host=self.dhost, database=self.database, \
-                user=self.duser, password=self.dpass)
+        # Setup a database connection
+        self._connect()
         
         # Setup session in the database
@@ -133 +133 @@
                 (self.session_id, self.username, self.mode))
     
+    def _connect(self):
+        # Close the existing connection
+        if self.db is not None:
+            try:
+                self.db.close()
+            except:
+                log_warn("Could not close existing db connection cleanly " \
+                        "in session #%s" % self.session_id, sys.exc_info())
+
+        # Setup a database connection  
+        self.db = PgSQL.connect(host=self.dhost, database=self.database, \
+                user=self.duser, password=self.dpass)
+
     def getSessionObject(self):
         """Returns a dictionary containing information about the session"""
@@ -351 +364 @@
         except:
             log_error("Unable to obtain cursor for query!", sys.exc_info())
+            # This pretty much means our db connection is hosed, reconnect
+            self._connect()
             self.lock.release()
             raise ccsd_session_error("Unable to obtain cursor for query!")
@@ -448 +463 @@
             commit = 1
         
+        # Obtain a cursor
+        try:
+            cursor = self.db.cursor()
+        except:
+            # This pretty much means our db connection is hosed, reconnect
+            self._connect()
+            log_error("Could not obtain cursor for execute", sys.exc_info())
+            self.lock.release()
+            raise ccsd_session_error("Could not obtain cursor")
+            
         # Execute the query
         try:
-            cursor = self.db.cursor()
             res = cursor.execute(sql, params)
         except:
@@ -634 +658 @@
 
         # Setup a database connection  
-        self.db = PgSQL.connect(host=self.dhost, database=self.database, \
-                user=self.duser, password=self.dpass)
+        self._connect()
         
         # Steal a session ID from the sequence, but don't put the session