From 1b0e08cfa0dbb43e98ecdba5a33d5e82051773bc Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 24 Nov 2012 11:12:20 -0600 Subject: [PATCH] fixed issue 1174, cache folder in examples --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 9 +++++---- applications/examples/controllers/appadmin.py | 9 +++++---- applications/welcome/controllers/appadmin.py | 9 +++++---- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index a004d1b0..4326af41 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.2.1 (2012-11-24 11:06:30) stable +Version 2.2.1 (2012-11-24 11:11:44) stable diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index f62af94c..d9b81010 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -396,12 +396,13 @@ def ccache(): if value[0] < ram['oldest']: ram['oldest'] = value[0] ram['keys'].append((key, GetInHMS(time.time() - value[0]))) - - locker = open(os.path.join(request.folder, - 'cache/cache.lock'), 'a') + folder = os.path.join(request.folder,'cache') + if not os.path.exists(folder): + os.mkdir(folder) + locker = open(os.path.join(folder, 'cache.lock'), 'a') portalocker.lock(locker, portalocker.LOCK_EX) disk_storage = shelve.open( - os.path.join(request.folder, 'cache/cache.shelve')) + os.path.join(folder, 'cache.shelve')) try: for key, value in disk_storage.items(): if isinstance(value, dict): diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index f62af94c..d9b81010 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -396,12 +396,13 @@ def ccache(): if value[0] < ram['oldest']: ram['oldest'] = value[0] ram['keys'].append((key, GetInHMS(time.time() - value[0]))) - - locker = open(os.path.join(request.folder, - 'cache/cache.lock'), 'a') + folder = os.path.join(request.folder,'cache') + if not os.path.exists(folder): + os.mkdir(folder) + locker = open(os.path.join(folder, 'cache.lock'), 'a') portalocker.lock(locker, portalocker.LOCK_EX) disk_storage = shelve.open( - os.path.join(request.folder, 'cache/cache.shelve')) + os.path.join(folder, 'cache.shelve')) try: for key, value in disk_storage.items(): if isinstance(value, dict): diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index f62af94c..d9b81010 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -396,12 +396,13 @@ def ccache(): if value[0] < ram['oldest']: ram['oldest'] = value[0] ram['keys'].append((key, GetInHMS(time.time() - value[0]))) - - locker = open(os.path.join(request.folder, - 'cache/cache.lock'), 'a') + folder = os.path.join(request.folder,'cache') + if not os.path.exists(folder): + os.mkdir(folder) + locker = open(os.path.join(folder, 'cache.lock'), 'a') portalocker.lock(locker, portalocker.LOCK_EX) disk_storage = shelve.open( - os.path.join(request.folder, 'cache/cache.shelve')) + os.path.join(folder, 'cache.shelve')) try: for key, value in disk_storage.items(): if isinstance(value, dict):