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

fix: [diagnostic] Catch connectionError exception

diagnosticTool
mokaddem 2019-06-17 15:09:08 +02:00
parent 3545eaa970
commit f3f2c0d4bf
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
diagnostic.py
View File

@ -292,7 +292,7 @@ def check_buffer_change_rate(spinner):
change_decrease = 0 change_decrease = 0
if time_slept >= sleep_max: if time_slept >= sleep_max:
return_flag = elements_in_inlist_init < elements_in_list or elements_in_list == 0 return_flag = elements_in_list == 0 or (elements_in_list - elements_in_inlist_init < 3)
return_text = f'Buffer is consumed {"faster" if return_flag else "slower" } than being populated' return_text = f'Buffer is consumed {"faster" if return_flag else "slower" } than being populated'
break break
@ -329,7 +329,7 @@ def check_dispatcher_status(spinner):
\t➥ Consider restarting it: {pgrep_dispatcher_output}''' \t➥ Consider restarting it: {pgrep_dispatcher_output}'''
break break
time.sleep(sleep_duration) time.sleep(sleep_duration)
spinner.text = f'No response yet' spinner.text = f'Dispatcher status: No response yet'
time_slept += sleep_duration time_slept += sleep_duration
else: else:
return_flag = True return_flag = True
@ -343,10 +343,13 @@ def check_dispatcher_status(spinner):
def check_server_listening(spinner): def check_server_listening(spinner):
url = f'{HOST}:{PORT}/_get_log_head' url = f'{HOST}:{PORT}/_get_log_head'
spinner.text = f'Trying to connect to {url}' spinner.text = f'Trying to connect to {url}'
r = requests.get(url) try:
r = requests.get(url)
except requests.exceptions.ConnectionError:
return (False, f'Can\'t connect to {url}')
return ( return (
r.status_code == 200, r.status_code == 200,
f'Server is {"not " if r.status_code != 200 else ""}running. Status code [{r.status_code}]' f'{url} {"not " if r.status_code != 200 else ""}reached. Status code [{r.status_code}]'
) )
@ -390,8 +393,8 @@ def start_diagnostic():
if check_buffer_queue() is not True: if check_buffer_queue() is not True:
check_buffer_change_rate() check_buffer_change_rate()
check_dispatcher_status() check_dispatcher_status()
check_server_listening() if check_server_listening():
check_server_dynamic_enpoint() check_server_dynamic_enpoint()
def main(): def main():