beenull/power-mailinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tighten the status text strings for free memory, add changelog entry

Browse source
This commit is contained in:
Joshua Tauberer 2016-01-01 18:11:27 -05:00
parent 59f8aa1c31
commit a9cd72bbf9
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,6 +1,10 @@
CHANGELOG CHANGELOG
========= =========
Control Panel:
* Report free memory usage.
Still In Development Still In Development
-------------------- --------------------

27
management/status_checks.py
View file

@ -206,24 +206,17 @@ def check_free_disk_space(rounded_values, env, output):
def check_free_memory(rounded_values, env, output): def check_free_memory(rounded_values, env, output):
# Check free memory. # Check free memory.
percent_used = psutil.virtual_memory().percent percent_free = 100 - psutil.virtual_memory().percent
percent_left = 100 - percent_used memory_msg = "System memory is %s%% free." % str(round(percent_free))
if not rounded_values: if percent_free >= 30:
memory_msg = "The system has allocated %s%% of the memory." % str(round(percent_used)) if rounded_values: memory_msg = "System free memory is at least 30%."
if percent_left > 20: output.print_ok(memory_msg)
output.print_ok(memory_msg) elif percent_free >= 15:
elif percent_left > 15: if rounded_values: memory_msg = "System free memory is below 30%."
output.print_warning(memory_msg) output.print_warning(memory_msg)
else:
output.print_error(memory_msg)
else: else:
memory_msg = "The system has less than %s%% memory left." % str(round(percent_left)) if rounded_values: memory_msg = "System free memory is below 15%."
if percent_left > 20: output.print_error(memory_msg)
output.print_ok("The system has more than 20% memory left")
elif percent_left > 15:
output.print_warning("The system has less than 20% memory left but more than 15%")
else:
output.print_error("The system has less than 15% memory left")
def run_network_checks(env, output): def run_network_checks(env, output):
# Also see setup/network-checks.sh. # Also see setup/network-checks.sh.