nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

diagnostics: don't run on disabled modules

Browse Source 
Reviewed-by: Joseph Nuthalapati <njoseph@riseup.net>
This commit is contained in:
Alice Kile 2019-11-22 12:02:06 +05:30 committed by Joseph Nuthalapati
parent 01bf96be4c
commit f9c9c62837
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plinth/modules/diagnostics/diagnostics.py
View File

@ -78,14 +78,15 @@ def _start_task():
if _running_task:
raise Exception('Task already running')
_running_task = threading.Thread(target=_run_on_all_modules_wrapper)
_running_task = threading.Thread(
target=_run_on_all_enabled_modules_wrapper)
_running_task.start()
def _run_on_all_modules_wrapper():
def _run_on_all_enabled_modules_wrapper():
"""Wrapper over actual task to catch exceptions."""
try:
run_on_all_modules()
run_on_all_enabled_modules()
except Exception as exception:
logger.exception('Error running diagnostics - %s', exception)
current_results['error'] = str(exception)
@ -94,8 +95,8 @@ def _run_on_all_modules_wrapper():
_running_task = None
def run_on_all_modules():
"""Run diagnostics on all modules and store the result."""
def run_on_all_enabled_modules():
"""Run diagnostics on all the enabled modules and store the result."""
global current_results
current_results = {
'modules': [],
@ -113,6 +114,9 @@ def run_on_all_modules():
if module.setup_helper.get_state() == 'needs-setup':
continue
if not module.app.is_enabled():
continue
modules.append((module_name, module))
current_results['results'][module_name] = None