Changeset 420

Timestamp:

07/06/05 22:25:50

Author:

mikerobi

Message:

sessionfilter configuration improvements, once the last remaing calls to sessionconfig.retrieve are removed everything should be ready for a release.

Files:

• trunk/cherrypy/lib/filter/sessionfilter/__init__.py (modified) (7 diffs)
• trunk/cherrypy/lib/filter/sessionfilter/anydbadaptor.py (modified) (1 diff)
• trunk/cherrypy/lib/filter/sessionfilter/basesession.py (modified) (4 diffs)
• trunk/cherrypy/lib/filter/sessionfilter/fileadaptor.py (modified) (3 diffs)
• trunk/cherrypy/lib/filter/sessionfilter/sessionconfig.py (modified) (1 diff)
• trunk/cherrypy/tutorial/tutorial.conf (modified) (1 diff)

trunk/cherrypy/lib/filter/sessionfilter/__init__.py

@@ -23 +23 @@
-    pass
-
+try:
+    from threading import local
+except ImportError:
+    from cherrypy._cpthreadinglocal import local
+
-
-class SessionFilter:
@@ -32 +37 @@
-        """ Initilizes the session filter and creates cherrypy.sessions  """
-
-        try:
-            from threading import local
-        except ImportError:
-            from cherrypy._cpthreadinglocal import local
-        
-        # Create as sessions object for accessing session data
-        cherrypy.sessions = local()
@@ -87 +87 @@
-        configMap = cherrypy.config.configMap
-        
-self.__localData.config
+configData
-        self.__localData.activeSessions = []
-        
-        for path in self.__pathList():
+            # cut index off the end of the pass
+            if path.endswith('/index'):
+                path = path[0:-5]
+            
+            # set the section 
-            if path == '/':
-                section = 'global'
-            else:
-                section = path
-
+
+
-            sectionData = {}
-            
+            # get the current settings or return an empty dictionary
-            settings = cherrypy.config.configMap.get(section, {})
-
+
+
-            for key, value in settings.iteritems():
+                # make sure this is a session setting
-                if key.startswith('sessionFilter.'):
-self.__localData.config
+configData
-                    keySplit = key.split('.')
+                    
+                    # if the key has 1 '.' then it is a default setting
-                    if len(keySplit) == 2:
-
-
-
+
+
+
+
+
+
+
+
+
+
-                    elif len(keySplit) == 3:
-                        currentSession = sectionData.setdefault(keySplit[1], {})
-                        currentSession[keySplit[2]] = value
-            
+            # we now iterate back over the settings and
+            # locate/initilize the session manager
-            for session, settings in sectionData.iteritems():
-                if not settings['on']:
@@ -121 +141 @@
-                    self.sessionManagers[session] = sessionManager
-                
+                # create a new local instance
+                setattr(sessionManager, 'settings', local())
+                
+                # set all of the default settings
+                for key, value in configData.get(None, {}).iteritems():
+                    setattr(sessionManager.settings, key, value)
+                
+                # set all of settings
+                for key, value in settings.iteritems():
+                    setattr(sessionManager.settings, key, value)
+
+                # add this to the list of active session managers
-                self.__localData.activeSessions.append(sessionManager)
-        
+
-    def __initSessions(self):
-        
@@ -169 +201 @@
-        # if we do not have a manually defined cookie path use path where the session
-        # manager was defined
-
-
+
+
+
+
+
+
-        
-        cherrypy.response.simpleCookie[cookieName] = sessionKey
@@ -176 +212 @@
-        cherrypy.response.simpleCookie[cookieName]['max-age'] = timeout*60
-        
+        # try and set the cookie domain
+        try:
+            cookieDomain = self.settings.cookieDomain
+            cherrypy.response.simpleCookie[cookieName]['domain'] = cookieDomain
+        except AttributeError:
+            pass
+
+        # try and set a cookie comment
+        try:
+            cookieComment = self.settings.cookieComment
+            cherrypy.response.simpleCookie[cookieName]['comment'] = cookieComment
+        except AttributeError:
+            pass
+
-    def __saveSessions(self):
-        
@@ -189 +239 @@
-            if sessionManager.nextCleanUp < now:
-                sessionManager.cleanUpOldSessions()
-config.retrieve('cleanUpDelay', sessionManager.name)
+Manager.settings.cleanUpDelay
-                sessionManager.nextCleanUp=now + cleanUpDelay * 60
-

trunk/cherrypy/lib/filter/sessionfilter/anydbadaptor.py

@@ -51 +51 @@
-        if not dbFile:
-            defaultFile = '%s.db' % sessionName
+            
-            storagePath = sessionconfig.retrieve('storagePath', sessionName)
+            
-            dbFile = os.path.join(storagePath, defaultFile)
-        self.__data = shelve.open(dbFile, 'c')

trunk/cherrypy/lib/filter/sessionfilter/basesession.py

@@ -67 +67 @@
-    def generateSessionKey(self):
-        """ Function to return a new sessioId """
-
+
+
+
+
-        
-        if sessionKeyFunc:
@@ -102 +105 @@
-
-        # settings dict
-local()
+None
-           
-    
@@ -145 +148 @@
-            self.setSession(session)
-        
-ssionconfig.retrieve('cacheTimeout',  self.name, None)
+lf.settings.cacheTimeout
-            
-            if session.threadCount == 0 and (self.noCache or not cacheTimeout):
@@ -158 +161 @@
-        """ cleanup all inactive sessions """
-        
-
+
+
-        # don't waste cycles if we aren't caching inactive sessions
-        if cacheTimeout and not self.noCache:

trunk/cherrypy/lib/filter/sessionfilter/fileadaptor.py

@@ -56 +56 @@
-            raise SessionNotFoundError
-        
-
+
+
-        fileName = '%s-%s' % (self.name, sessionKey)
-        filePath = os.path.join(storageDir, fileName)
@@ -72 +73 @@
-    def setSession(self, sessionData):
-    
-
+
+
-        fileName = '%s-%s' % (self.name, sessionData.key)
-        filePath = os.path.join(storageDir, fileName)
@@ -83 +85 @@
-
-    def delSession(self, sessionKey):
-ssionconfig.retrieve('storagePath', self.name)  
+lf.settings.storagePath
-        fileName = '%s-%s' % (self.name, sessionKey)
-        filePath = os.path.join(storageDir, fileName)

trunk/cherrypy/lib/filter/sessionfilter/sessionconfig.py

@@ -43 +43 @@
-    'sessionFilter.cookiePrefix': 'CherryPySession',
-    'sessionFilter.storagePath': '.sessiondata',
-
+
+
-}
-

trunk/cherrypy/tutorial/tutorial.conf

@@ -3 +3 @@
-server.threadPool = 10
-server.environment = "production"
-sessionFilter.default.storageType= "ram"
-# server.logToScreen = False