external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-25 02:47:04 +00:00
Code Issues Releases Wiki Activity

merge #936 - fix wonky free disk space messages - from cmsirbu/master

Browse Source 
fix status_checks.py free disk space reporting, fixes #932
This commit is contained in:
Joshua Tauberer 2016-09-16 07:31:57 -04:00 committed by GitHub
commit 58541c467f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
management/status_checks.py
View File

@ -229,15 +229,15 @@ def check_free_disk_space(rounded_values, env, output):
st = os.statvfs(env['STORAGE_ROOT']) st = os.statvfs(env['STORAGE_ROOT'])
bytes_total = st.f_blocks * st.f_frsize bytes_total = st.f_blocks * st.f_frsize
bytes_free = st.f_bavail * st.f_frsize bytes_free = st.f_bavail * st.f_frsize
if not rounded_values: disk_msg = "The disk has %.2f GB space remaining." % (bytes_free/1024.0/1024.0/1024.0)
disk_msg = "The disk has %s GB space remaining." % str(round(bytes_free/1024.0/1024.0/1024.0*10.0)/10)
else:
disk_msg = "The disk has less than %s%% space left." % str(round(bytes_free/bytes_total/10 + .5)*10)
if bytes_free > .3 * bytes_total: if bytes_free > .3 * bytes_total:
if rounded_values: disk_msg = "The disk has more than 30% free space."
output.print_ok(disk_msg) output.print_ok(disk_msg)
elif bytes_free > .15 * bytes_total: elif bytes_free > .15 * bytes_total:
if rounded_values: disk_msg = "The disk has less than 30% free space."
output.print_warning(disk_msg) output.print_warning(disk_msg)
else: else:
if rounded_values: disk_msg = "The disk has less than 15% free space."
output.print_error(disk_msg) output.print_error(disk_msg)
def check_free_memory(rounded_values, env, output): def check_free_memory(rounded_values, env, output):
@ -472,7 +472,7 @@ def check_dns_zone(domain, env, output, dns_zonefiles):
% (existing_ns, correct_ns) ) % (existing_ns, correct_ns) )
# Check that each custom secondary nameserver resolves the IP address. # Check that each custom secondary nameserver resolves the IP address.
if custom_secondary_ns and not probably_external_dns: if custom_secondary_ns and not probably_external_dns:
for ns in custom_secondary_ns: for ns in custom_secondary_ns:
# We must first resolve the nameserver to an IP address so we can query it. # We must first resolve the nameserver to an IP address so we can query it.
@ -897,7 +897,7 @@ class FileOutput:
class ConsoleOutput(FileOutput): class ConsoleOutput(FileOutput):
def __init__(self): def __init__(self):
self.buf = sys.stdout self.buf = sys.stdout
# Do nice line-wrapping according to the size of the terminal. # Do nice line-wrapping according to the size of the terminal.
# The 'stty' program queries standard input for terminal information. # The 'stty' program queries standard input for terminal information.
if sys.stdin.isatty(): if sys.stdin.isatty():