Issue 1466 (#1471)

* Closing branch * Properly cache thread-local database connection object. #1466 * Check cursor closed attribute correctly. #1466 * Don't let leaky API processes live longer than 30 minutes. #1466 * Remove closed branch file from earlier mistake --------- Co-authored-by: Andy Lake <[email protected]>
perfsonar · Sep 4, 2024 · de48184 · de48184
1 parent 6510d0e
commit de48184
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/pscheduler-server/pscheduler-server/api-server/pscheduler-api-server.conf.raw b/pscheduler-server/pscheduler-server/api-server/pscheduler-api-server.conf.raw
@@ -10,8 +10,9 @@ WSGIDaemonProcess __USER_NAME__ \
 		  \
 		  processes=10 \
 		  maximum-requests=1000000 \
-		  graceful-timeout=300
-
+		  graceful-timeout=300 \
+		  restart-interval=1800 \
+		  inactivity-timeout=600
 
 WSGIScriptAlias __API_ROOT__ __API_DIR__/__NAME__.wsgi
 

diff --git a/pscheduler-server/pscheduler-server/api-server/pschedulerapiserver/dbcursor.py b/pscheduler-server/pscheduler-server/api-server/pschedulerapiserver/dbcursor.py
@@ -65,7 +65,7 @@ def cursor(self):
 
         # Make sure we have a cursor.
 
-        if self.ccursor is None or self.ccursor.closed():
+        if self.ccursor is None or self.ccursor.closed:
             self.ccursor = self.db.cursor()
 
         return self.ccursor
@@ -74,7 +74,12 @@ def cursor(self):
 
 def dbcursor():
     """Get this thread's database cursor"""
-    return getattr(module.threadlocal, "cursor", DBCursor()).cursor()
+    try:
+        cursor = getattr(module.threadlocal, 'cursor')
+    except AttributeError:
+        cursor = DBCursor()
+        setattr(module.threadlocal, 'cursor', cursor)
+    return cursor.cursor()
 
 
 def dbcursor_query(query,