From 08fe4695f6d5ef09789688481db478d0decbd5df Mon Sep 17 00:00:00 2001 From: Krateng Date: Fri, 5 Jun 2020 13:20:54 +0200 Subject: [PATCH] High RAM usage affects all caches --- maloja/__pkginfo__.py | 2 +- maloja/database.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py index 561a9ae..8fb703b 100644 --- a/maloja/__pkginfo__.py +++ b/maloja/__pkginfo__.py @@ -5,7 +5,7 @@ author = { "email":"maloja@krateng.dev", "github": "krateng" } -version = 2,4,9 +version = 2,4,10 versionstr = ".".join(str(n) for n in version) links = { "pypi":"malojaserver", diff --git a/maloja/database.py b/maloja/database.py index aefe140..4f62ab5 100644 --- a/maloja/database.py +++ b/maloja/database.py @@ -1173,8 +1173,8 @@ def invalidate_caches(): log("Database caches invalidated.") def reduce_caches(to=0.75): - global cache_query, cache_aggregate - for c in cache_query, cache_aggregate: + global cache_query, cache_aggregate, cache_query_perm, cache_aggregate_perm + for c in cache_query, cache_aggregate, cache_query_perm, cache_aggregate_perm: currentsize = len(c) targetsize = int(currentsize * to) c.set_size(targetsize) @@ -1183,7 +1183,7 @@ def reduce_caches(to=0.75): def reduce_caches_if_low_ram(): ramprct = psutil.virtual_memory().percent if ramprct > cmp: - log("{prct}% RAM usage, reducing temporary caches!".format(prct=ramprct),module="debug") + log("{prct}% RAM usage, reducing caches!".format(prct=ramprct),module="debug") ratio = (cmp / ramprct) ** 3 reduce_caches(to=ratio)