fixed issue with scheduler and cache.disk introduced in 2.8.1
This commit is contained in:
1 parent
a55c6777d3
commit
64b670fd8f
4 files changed
+10
-4
No files matched your search
@@ -6,7 +6,7 @@
|
|||||||
- bootstrap 2.3.2
|
- bootstrap 2.3.2
|
||||||
- codemirror 3.19
|
- codemirror 3.19
|
||||||
- improved mongoDB support, thanks Alan
|
- improved mongoDB support, thanks Alan
|
||||||
- suport for wiki custom render function
|
- support for wiki custom render function
|
||||||
- Wiki(...groups=['x','y']) allows bypassing default permissions
|
- Wiki(...groups=['x','y']) allows bypassing default permissions
|
||||||
- fixed websocket_messaging.py to support newer Tornado
|
- fixed websocket_messaging.py to support newer Tornado
|
||||||
- NDB support for GAE, thanks Quint
|
- NDB support for GAE, thanks Quint
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
Version 2.8.1-stable+timestamp.2013.11.27.13.52.50
|
Version 2.8.1-stable+timestamp.2013.11.28.07.50.08
|
||||||
@@ -254,7 +254,10 @@ class CacheOnDisk(CacheAbstract):
|
|||||||
try:
|
try:
|
||||||
if self.storage:
|
if self.storage:
|
||||||
self.storage.close()
|
self.storage.close()
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
finally:
|
finally:
|
||||||
|
self.storage = None
|
||||||
if self.locker and self.locked:
|
if self.locker and self.locked:
|
||||||
portalocker.unlock(self.locker)
|
portalocker.unlock(self.locker)
|
||||||
self.locker.close()
|
self.locker.close()
|
||||||
|
|||||||
+5
-2
@@ -131,8 +131,11 @@ def env(
|
|||||||
request.function = f or 'index'
|
request.function = f or 'index'
|
||||||
response.view = '%s/%s.html' % (request.controller,
|
response.view = '%s/%s.html' % (request.controller,
|
||||||
request.function)
|
request.function)
|
||||||
ip = global_settings.cmd_options.ip
|
if global_settings.cmd_options:
|
||||||
port = global_settings.cmd_options.port
|
ip = global_settings.cmd_options.ip
|
||||||
|
port = global_settings.cmd_options.port
|
||||||
|
else:
|
||||||
|
ip, port = '127.0.0.1', '8000'
|
||||||
request.env.http_host = '%s:%s' % (ip,port)
|
request.env.http_host = '%s:%s' % (ip,port)
|
||||||
request.env.remote_addr = '127.0.0.1'
|
request.env.remote_addr = '127.0.0.1'
|
||||||
request.env.web2py_runtime_gae = global_settings.web2py_runtime_gae
|
request.env.web2py_runtime_gae = global_settings.web2py_runtime_gae
|
||||||
|
|||||||
Reference in new issue
Block a user