From 4d330f5163ff4d1b608c2938db7dc64cef225fed Mon Sep 17 00:00:00 2001 From: Krateng Date: Fri, 10 May 2019 13:35:06 +0200 Subject: [PATCH] Made DiskDict optional --- database.py | 12 ++++++------ settings/default.ini | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/database.py b/database.py index 4a3146f..811d72c 100644 --- a/database.py +++ b/database.py @@ -900,10 +900,10 @@ def sync(): import copy cache_query = {} -if doreah.version >= (0,7,1): - cache_query_permanent = DiskDict(name="dbquery",folder="cache",maxmemory=1024*1024*10,maxstorage=1024*1024*settings.get_settings("DB_CACHE_SIZE")) +if doreah.version >= (0,7,1) and settings.get_settings("EXPERIMENTAL_FEATURES"): + cache_query_permanent = DiskDict(name="dbquery",folder="cache",maxmemory=1024*1024*500,maxstorage=1024*1024*settings.get_settings("DB_CACHE_SIZE")) else: - cache_query_permanent = Cache(maxmemory=1024*1024*10) + cache_query_permanent = Cache(maxmemory=1024*1024*500) cacheday = (0,0,0) def db_query(**kwargs): check_cache_age() @@ -926,10 +926,10 @@ def db_query(**kwargs): return result cache_aggregate = {} -if doreah.version >= (0,7,1): - cache_aggregate_permanent = DiskDict(name="dbaggregate",folder="cache",maxmemory=1024*1024*10,maxstorage=1024*1024*settings.get_settings("DB_CACHE_SIZE")) +if doreah.version >= (0,7,1) and settings.get_settings("EXPERIMENTAL_FEATURES"): + cache_aggregate_permanent = DiskDict(name="dbaggregate",folder="cache",maxmemory=1024*1024*500,maxstorage=1024*1024*settings.get_settings("DB_CACHE_SIZE")) else: - cache_aggregate_permanent = Cache(maxmemory=1024*1024*10) + cache_aggregate_permanent = Cache(maxmemory=1024*1024*500) def db_aggregate(**kwargs): check_cache_age() global cache_aggregate, cache_aggregate_permanent diff --git a/settings/default.ini b/settings/default.ini index f1ed7ee..e3c0ff6 100644 --- a/settings/default.ini +++ b/settings/default.ini @@ -30,3 +30,7 @@ DEFAULT_RANGE_CHARTS_TRACKS = year # same for pulse view # can be days, weeks, months, years DEFAULT_RANGE_PULSE = months + +[Misc] + +EXPERIMENTAL_FEATURES = no