Merge d57bf81 into ebde52d

StorjOld · Sep 20, 2015 · cf0e64a · cf0e64a
2 parents ebde52d + d57bf81
commit cf0e64a
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/dataserv/config.py b/dataserv/config.py
@@ -34,5 +34,12 @@
                     level=logging.DEBUG)
 TOTAL_UPDATE = 30  # minutes
 
-DISABLE_CACHING = False
-CACHING_TIME = 30  # seconds
+if os.environ.get("DATASERV_CACHING_TIME"):
+    DISABLE_CACHING = bool(os.environ.get("DATASERV_CACHING_TIME")==0)
+else:
+    DISABLE_CACHING = False
+
+if os.environ.get("DATASERV_CACHING_TIME"):
+    CACHING_TIME = int(os.environ.get("DATASERV_CACHING_TIME"))
+else:
+    CACHING_TIME = 30  # seconds