external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-29 04:17:07 +00:00
Code Issues Releases Wiki Activity

if all system services are running, say so in the status checks rather than being totally silent

Browse Source
This commit is contained in:
Joshua Tauberer 2015-01-17 15:25:28 +00:00
parent d742ad4038
commit 2b7326f504
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
management/status_checks.py
View File

@ -68,7 +68,8 @@ def run_services_checks(env):
{ "name": "HTTPS Web (nginx)", "port": 443, "public": True, }, { "name": "HTTPS Web (nginx)", "port": 443, "public": True, },
] ]
ok = True error = False
fatal = False
for service in services: for service in services:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@ -78,6 +79,7 @@ def run_services_checks(env):
"127.0.0.1" if not service["public"] else env['PUBLIC_IP'], "127.0.0.1" if not service["public"] else env['PUBLIC_IP'],
service["port"])) service["port"]))
except OSError as e: except OSError as e:
error = True
env['out'].print_error("%s is not running (%s)." % (service['name'], str(e))) env['out'].print_error("%s is not running (%s)." % (service['name'], str(e)))
# Why is nginx not running? # Why is nginx not running?
@ -86,12 +88,15 @@ def run_services_checks(env):
# Flag if local DNS is not running. # Flag if local DNS is not running.
if service["port"] == 53 and service["public"] == False: if service["port"] == 53 and service["public"] == False:
ok = False fatal = True
finally: finally:
s.close() s.close()
return ok if not error:
env['out'].print_ok("All system services are running.")
return not fatal
def run_system_checks(env): def run_system_checks(env):
check_ssh_password(env) check_ssh_password(env)