Add option RetainSessions

This allows disabling the feature that MemoryStore sessions
are saved when the server stops and restored when it starts again.

Author: Cito

WebKit/Application.py

@@ -52,6 +52,7 @@
     SessionPrefix = '',
     SessionName = '_SID_',
     AlwaysSaveSessions = True,
+    RetainSessions = True,
     IgnoreInvalidSession = True,
     UseAutomaticPathSessions = False,
     UseCookieSessions = True,
@@ -220,6 +221,7 @@ def initSessions(self):
             self.defaultConfig()['SessionName'])
         self._autoPathSessions = self.setting('UseAutomaticPathSessions')
         self._alwaysSaveSessions = self.setting('AlwaysSaveSessions')
+        self._retainSessions = self.setting('RetainSessions')
         moduleName = self.setting('SessionModule')
         className = moduleName.rsplit('.', 1)[-1]
         try:

WebKit/Configs/Application.config

@@ -59,6 +59,8 @@ MaxDynamicMemorySessions = 10000
 DynamicSessionTimeout = 15
 # Set to False if sessions should be saved only when dirty:
 AlwaysSaveSessions = True
+# Set to False if sessions should not be retained when the server stops:
+RetainSessions = True
 # The session ID can be prefixed with "hostname" or any other string:
 SessionPrefix = None  # no prefix to session ID
 IgnoreInvalidSession = True

WebKit/SessionFileStore.py

@@ -28,13 +28,15 @@ class SessionFileStore(SessionStore):
 
     ## Init ##
 
-    def __init__(self, app, restoreFiles=True):
+    def __init__(self, app, restoreFiles=None):
         """Initialize the session file store.
 
         If restoreFiles is true, and sessions have been saved to file,
         the store will be initialized from these files.
         """
         SessionStore.__init__(self, app)
+        if restoreFiles is None:
+            restoreFiles = self._retain
         self._sessionDir = app._sessionDir
         self._lock = threading.RLock()
         if not restoreFiles:

WebKit/SessionMemoryStore.py

@@ -15,14 +15,16 @@ class SessionMemoryStore(SessionStore):
 
     ## Init ##
 
-    def __init__(self, app, restoreFiles=True):
+    def __init__(self, app, restoreFiles=None):
         """Initialize the session memory store.
 
         If restoreFiles is true, and sessions have been saved to file,
         the store will be initialized from these files.
         """
         SessionStore.__init__(self, app)
         self._store = {}
+        if restoreFiles is None:
+            restoreFiles = self._retain
         if restoreFiles:
             filestore = SessionFileStore(app)
             for key in filestore:
@@ -31,6 +33,7 @@ def __init__(self, app, restoreFiles=True):
                 except Exception:
                     app.handleException()
             filestore.clear()
+        self._restoreFiles = restoreFiles
 
 
     ## Access ##
@@ -96,6 +99,7 @@ def storeSession(self, session):
 
     def storeAllSessions(self):
         """Permanently save all sessions in the store."""
-        filestore = SessionFileStore(self._app)
-        for key, session in self.items():
-            filestore[key] = session
+        if self._restoreFiles:
+            filestore = SessionFileStore(self._app)
+            for key, session in self.items():
+                filestore[key] = session

WebKit/SessionShelveStore.py

@@ -19,13 +19,15 @@ class SessionShelveStore(SessionStore):
 
     ## Init ##
 
-    def __init__(self, app, restoreFiles=True, filename=None):
+    def __init__(self, app, restoreFiles=None, filename=None):
         """Initialize the session shelf.
 
         If restoreFiles is true, existing shelve file(s) will be reused.
         """
         SessionStore.__init__(self, app)
         filename = os.path.join(app._sessionDir, filename or self._filename)
+        if restoreFiles is None:
+            restoreFiles = self._retain
         flag = 'c' if restoreFiles else 'n'
         self._store = shelve.open(filename,
             flag=flag, protocol=maxPickleProtocol)

WebKit/SessionStore.py

@@ -60,6 +60,7 @@ def __init__(self, app):
         """
         self._app = app
         self._alwaysSave = app._alwaysSaveSessions
+        self._retain = app._retainSessions
         self._encoder = dumpWithHighestProtocol
         self._decoder = load