Changeset 1454

Timestamp:

11/28/06 16:25:43

Author:

fumanchu

Message:

Fix for the fix for #604 (session lockfile warning).

Files:

• trunk/cherrypy/lib/sessions.py (modified) (3 diffs)

trunk/cherrypy/lib/sessions.py

@@ -228 +228 @@
-    LOCK_SUFFIX = '.lock'
-    
-
-
-
+
-        # Warn if any lock files exist at startup.
-        lockfiles = [fname for fname in os.listdir(self.storage_path)
@@ -427 +425 @@
-        id = request.cookie[name].value
-    
-    if not hasattr(cherrypy, "session"):
-        cherrypy.session = cherrypy._ThreadLocalProxy('session', _def_session)
-    
-    # Create and attach a new Session instance to cherrypy._serving.
-    # It will possess a reference to (and lock, and lazily load)
@@ -437 +432 @@
-    kwargs['clean_freq'] = clean_freq
-    cherrypy._serving.session = sess = globals()[storage_class](id, **kwargs)
+    
+    if not hasattr(cherrypy, "session"):
+        cherrypy.session = cherrypy._ThreadLocalProxy('session', _def_session)
+        if hasattr(sess, "setup"):
+            sess.setup()
-    
-    if locking == 'implicit':