MISP
/
misp-dashboard
mirror of https://github.com/MISP/misp-dashboard
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: [diagnostic] Added new catches to better handle errors

pull/145/head
mokaddem 2020-02-10 07:44:20 +01:00
parent d0b9e05fe8
commit 6510e6dca1
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
diagnostic.py
View File

@ -148,12 +148,16 @@ def check_configuration(spinner):
@add_spinner(name='dot') @add_spinner(name='dot')
def check_file_permission(spinner): def check_file_permission(spinner):
max_mind_database_path = configuration_file.get('RedisMap', 'pathmaxminddb') max_mind_database_path = configuration_file.get('RedisMap', 'pathmaxminddb')
try:
st = os.stat(max_mind_database_path) st = os.stat(max_mind_database_path)
except FileNotFoundError:
return (False, 'Maxmind GeoDB - File not found')
all_read_perm = bool(st.st_mode & stat.S_IROTH) # FIXME: permission may be changed all_read_perm = bool(st.st_mode & stat.S_IROTH) # FIXME: permission may be changed
if all_read_perm: if all_read_perm:
return (True, '') return (True, '')
else: else:
return (False, 'Maxmin GeoDB might have incorrect read file permission') return (False, 'Maxmind GeoDB might have incorrect read file permission')
@add_spinner @add_spinner
@ -215,10 +219,14 @@ def check_zmq(spinner):
@add_spinner @add_spinner
def check_processes_status(spinner): def check_processes_status(spinner):
global pgrep_subscriber_output, pgrep_dispatcher_output global pgrep_subscriber_output, pgrep_dispatcher_output
try:
response = subprocess.check_output( response = subprocess.check_output(
["pgrep", "-laf", "zmq_"], ["pgrep", "-laf", "zmq_"],
universal_newlines=True universal_newlines=True
) )
except subprocess.CalledProcessError as e:
return (False, 'Could not get processes status. Error returned:\n'+str(e))
for line in response.splitlines(): for line in response.splitlines():
lines = line.split(' ', maxsplit=1) lines = line.split(' ', maxsplit=1)
pid, p_name = lines pid, p_name = lines