From 46781d3ee1815cc0f43167c3982db6a1f48a2c89 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 6 Sep 2014 08:46:54 +0200 Subject: [PATCH] Blocked cache rmem checks in windows until we have figured out some other way to check this. --- src/utils/idmapper/base.py | 4 ++++ src/utils/utils.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/utils/idmapper/base.py b/src/utils/idmapper/base.py index 3a868125d..122c5b7d2 100755 --- a/src/utils/idmapper/base.py +++ b/src/utils/idmapper/base.py @@ -418,6 +418,10 @@ def conditional_flush(max_rmem, force=False): "once in %s min interval. Check memory usage." % (AUTO_FLUSH_MIN_INTERVAL/60.0)) return + if os.name == "nt": + # we can't look for mem info in Windows at the moment + return + # check actual memory usage Ncache_max = mem2cachesize(max_rmem) Ncache, _ = cache_size() diff --git a/src/utils/utils.py b/src/utils/utils.py index 07068e6d1..8be0eb73d 100644 --- a/src/utils/utils.py +++ b/src/utils/utils.py @@ -274,6 +274,9 @@ def datetime_format(dtobj): def host_os_is(osname): """ Check to see if the host OS matches the query. + Common osnames are + posix + nt """ if os.name == osname: return True