Ticket #717: session_len.patch

cherrypy/__init__.py

@@ -267 +267 @@
-    def __contains__(self, key):
-        child = getattr(serving, self.__attrname__)
-        return key in child
+        
+    def __len__(self):
+        child = getattr(serving, self.__attrname__)
+        return len(child)
-
-
-# Create request and response object (the same objects will be used

cherrypy/lib/sessions.py

@@ -233 +233 @@
-    def release_lock(self):
-        self.locks[self.id].release()
-        self.locked = False
+        
+    def __len__(self):
+        "Returns number of active sessions"
+        return len(self.cache)
-
-
-class FileSession(Session):
@@ -328 +332 @@
-                            os.unlink(path)
-                finally:
-                    self.release_lock(path)
+    
+    def __len__(self):
+        "Returns number of active sessions"
+        sessions = os.listdir(self.storage_path)
+        sessions = [fname for fname in sessions if (fname.startswith(self.SESSION_PREFIX) and not fname.endswith(self.LOCK_SUFFIX))]
+        return len(sessions)
+        
+        
-
-
-class PostgresqlSession(Session):