[Hejes-devel] [1411] Disabled memcached globally

[hejes-devel at nytud.hu]

Revision: 1411
Author:   mihaltz
Date:     2015-07-09 15:20:34 +0200 (Thu, 09 Jul 2015)
Log Message:
-----------
Disabled memcached globally

Modified Paths:
--------------
    trunk/web2py/applications/helyesiras_webdev/modules/MemcacheHelper.py

Modified: trunk/web2py/applications/helyesiras_webdev/modules/MemcacheHelper.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/MemcacheHelper.py	2015-07-09 10:14:38 UTC (rev 1410)
+++ trunk/web2py/applications/helyesiras_webdev/modules/MemcacheHelper.py	2015-07-09 13:20:34 UTC (rev 1411)
@@ -4,7 +4,7 @@
 client = None
 
 # Set this to True to disable memcache access, as if no key was ever found (for performance testing without caching)
-DISABLE_CACHING_DEBUG = False
+DISABLE_CACHING_DEBUG = True
 
 def getClient() :
     global client
@@ -24,11 +24,14 @@
         global DISABLE_CACHING_DEBUG
         hexdigest = generateMemcacheKey(args, kwargs)
         key = f.__class__.__name__ + '.' + f.__name__ + '(' + hexdigest + ')'
-        if not DISABLE_CACHING_DEBUG and not getClient().add(key, 1) :
+        if not getClient().add(key, 1) :
             return getClient().get(key)
         else :
             value = f(*args, **kwargs)
             getClient().set(key, value)
             return value
-    return memcache_memoized_function
+    if not DISABLE_CACHING_DEBUG:
+        return memcache_memoized_function
+    else:
+        return f