Changeset 11816 for main/waeup.kofa/trunk/src/waeup/kofa/utils

Timestamp:

24 Sep 2014, 15:20:55 (10 years ago)

Author:

uli

Message:

Prepare for other external parameters than swap.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/utils

Files:

• tests/test_utils.py (modified) (1 diff)
• utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_utils.py

@@ -46 +46 @@
         utils.SYSTEM_MAX_LOAD['swap-mem'] = None
         assert utils.expensive_actions_allowed() == True
+        # even not-set values won't block us
+        del utils.SYSTEM_MAX_LOAD['swap-mem']
+        assert utils.expensive_actions_allowed() == True
 
     @unittest.skipIf(

main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py

@@ -318 +318 @@
         """
         max_values = self.SYSTEM_MAX_LOAD
-        if max_values['swap-mem'] is not None:
-            swap_mem = psutil.swap_memory()
-            max_val = max_values['swap-mem']
+        for (key, func) in (
+            ('swap-mem', psutil.swap_memory),
+            ):
+            max_val = max_values.get(key, None)
+            if max_val is None:
+                continue
+            mem_val = func()
             if isinstance(max_val, float):
+                # percents
                 if max_val < 0.0:
                     max_val += 100.0
-                if swap_mem.percent > max_val:
+                if mem_val.percent > max_val:
                     return False
             else:
+                # number of bytes
                 if max_val < 0:
-                    max_val += swap_mem.total
-                if swap_mem.used > max_val:
+                    max_val += mem_val.total
+                if mem_val.used > max_val:
                     return False
         return True