Commits

Ben Bangert committed d41730e Merge

merge

Comments (0)

Files changed (4)

beaker/container.py

 
     def get_creation_lock(self, key):
         return file_synchronizer(
-                    identifier = "dbmcontainer/funclock/%s" % self.namespace, 
+                    identifier = "dbmcontainer/funclock/%s/%s" % (
+                        self.namespace, key
+                    ),
                     lock_dir=self.lock_dir
                 )
 
 
     def get_creation_lock(self, key):
         return file_synchronizer(
-                identifier = "filecontainer/funclock/%s" % self.namespace, 
+                identifier = "dbmcontainer/funclock/%s/%s" % (
+                    self.namespace, key
+                ),
                 lock_dir = self.lock_dir
                 )
 

beaker/ext/database.py

 
     def get_creation_lock(self, key):
         return file_synchronizer(
-            identifier ="databasecontainer/funclock/%s" % self.namespace,
+            identifier ="databasecontainer/funclock/%s/%s" % (
+                self.namespace, key
+            ),
             lock_dir = self.lock_dir)
 
     def do_open(self, flags, replace):

beaker/ext/memcached.py

 
     def get_creation_lock(self, key):
         return file_synchronizer(
-            identifier="memcachedcontainer/funclock/%s" %
-                    self.namespace, lock_dir=self.lock_dir)
+            identifier="memcachedcontainer/funclock/%s/%s" %
+                    (self.namespace, key), lock_dir=self.lock_dir)
 
     def _format_key(self, key):
         return self.namespace + '_' + key.replace(' ', '\302\267')
         ('encrypt_key', (str, types.NoneType), "Session validate_key must be "
          "a string."),
         ('secure', (bool, types.NoneType), "Session secure must be a boolean."),
+        ('httponly', (bool, types.NoneType), "Session httponly must be a boolean."),
         ('timeout', (int, types.NoneType), "Session timeout must be an "
          "integer."),
         ('auto', (bool, types.NoneType), "Session is created if accessed."),