From 55c9392de40df9ba28cf80bb0b099315eff3eaed Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 11 Mar 2013 10:22:40 -0500 Subject: [PATCH] fixed ccache, issue 1377 --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 5 ++++- applications/examples/controllers/appadmin.py | 5 ++++- applications/welcome/controllers/appadmin.py | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 82ad006f..d6965413 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.2-stable+timestamp.2013.03.11.10.00.19 +Version 2.4.2-stable+timestamp.2013.03.11.10.21.55 diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index a2b2c6ab..dd8a49c1 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -319,6 +319,9 @@ def state(): def ccache(): + cache.ram.initialize() + cache.disk.initialize() + form = FORM( P(TAG.BUTTON( T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")), @@ -385,7 +388,7 @@ def ccache(): return (hours, minutes, seconds) - for key, value in cache.ram.storage.items(): + for key, value in cache.ram.storage.iteritems(): if isinstance(value, dict): ram['hits'] = value['hit_total'] - value['misses'] ram['misses'] = value['misses'] diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index a2b2c6ab..dd8a49c1 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -319,6 +319,9 @@ def state(): def ccache(): + cache.ram.initialize() + cache.disk.initialize() + form = FORM( P(TAG.BUTTON( T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")), @@ -385,7 +388,7 @@ def ccache(): return (hours, minutes, seconds) - for key, value in cache.ram.storage.items(): + for key, value in cache.ram.storage.iteritems(): if isinstance(value, dict): ram['hits'] = value['hit_total'] - value['misses'] ram['misses'] = value['misses'] diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index a2b2c6ab..dd8a49c1 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -319,6 +319,9 @@ def state(): def ccache(): + cache.ram.initialize() + cache.disk.initialize() + form = FORM( P(TAG.BUTTON( T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")), @@ -385,7 +388,7 @@ def ccache(): return (hours, minutes, seconds) - for key, value in cache.ram.storage.items(): + for key, value in cache.ram.storage.iteritems(): if isinstance(value, dict): ram['hits'] = value['hit_total'] - value['misses'] ram['misses'] = value['misses']