Anonymous avatar Anonymous committed 8f24c02

Don't lock session file when trying to clean up old session. This is not needed since we're only reading the file and not writing to it.

Comments (0)

Files changed (1)

cherrypy/filters/sessionfilter.py

         for fname in os.listdir(storagePath):
             if (fname.startswith(self.SESSION_PREFIX)
                 and not fname.endswith(self.LOCK_SUFFIX)):
-                # We have a session file: lock it, load it and check
-                #   if it's expired
+                # We have a session file: try to load it and check
+                #   if it's expired. If it fails, nevermind.
                 filePath = os.path.join(storagePath, fname)
-                lockFilePath = filePath + self.LOCK_SUFFIX
-                self._lockFile(lockFilePath)
                 try:
                     f = open(filePath, "rb")
                     data, expirationTime = pickle.load(f)
                         id = fname[len(self.SESSION_PREFIX):]
                         sess.onDeleteSession(data)
                         os.unlink(filePath)
-                except IOError:
+                except:
                     # We can't access the file ... nevermind
                     pass
-                self._unlockFile(lockFilePath)
     
     def _getFilePath(self, id):
         storagePath = cherrypy.config.get('session_filter.storage_path')
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.