YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Handle cases where some category might fail for some reason

Browse source
This commit is contained in:
Alexandre Aubin 2018-08-30 17:49:42 +00:00
parent 8a415579bf
commit b03e3a487e
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/hooks/diagnosis/10-ip.py
View file

@ -55,6 +55,6 @@ class IPDiagnoser(Diagnoser):
def main(args, env, loggers): def main(args, env, loggers):
IPDiagnoser(args, env, loggers).diagnose()
return IPDiagnoser(args, env, loggers).report() return 0

26
src/yunohost/diagnosis.py
View file

@ -58,7 +58,12 @@ def diagnosis_show(categories=[], full=False):
raise MoulinetteError(m18n.n('unknown_categories', categories=", ".join(categories))) raise MoulinetteError(m18n.n('unknown_categories', categories=", ".join(categories)))
# Fetch all reports # Fetch all reports
all_reports = [ Diagnoser.get_cached_report(c) for c in categories ] all_reports = []
for category in categories:
try:
all_reports.append(Diagnoser.get_cached_report(category))
except Exception as e:
logger.error("Failed to fetch diagnosis result for category '%s' : %s" % (category, str(e))) # FIXME : i18n
# "Render" the strings with m18n.n # "Render" the strings with m18n.n
for report in all_reports: for report in all_reports:
@ -83,7 +88,7 @@ def diagnosis_run(categories=[], force=False, args=None):
else: else:
unknown_categories = [ c for c in categories if c not in all_categories_names ] unknown_categories = [ c for c in categories if c not in all_categories_names ]
if unknown_categories: if unknown_categories:
raise MoulinetteError(m18n.n('unknown_categories', categories=", ".join(categories))) raise MoulinetteError(m18n.n('unknown_categories', categories=", ".join(unknown_categories)))
# Transform "arg1=val1&arg2=val2" to { "arg1": "val1", "arg2": "val2" } # Transform "arg1=val1&arg2=val2" to { "arg1": "val1", "arg2": "val2" }
if args is not None: if args is not None:
@ -92,15 +97,20 @@ def diagnosis_run(categories=[], force=False, args=None):
args = {} args = {}
args["force"] = force args["force"] = force
# Call the hook ... # Call the hook ...
successes = []
for category in categories: for category in categories:
logger.debug("Running diagnosis for %s ..." % category) logger.debug("Running diagnosis for %s ..." % category)
path = [p for n, p in all_categories if n == category ][0] path = [p for n, p in all_categories if n == category ][0]
# TODO : get the return value and do something with it try:
return {"report": hook_exec(path, args=args, env=None) } hook_exec(path, args=args, env=None)
successes.append(category)
except Exception as e:
# FIXME / TODO : add stacktrace here ?
logger.error("Diagnosis failed for category '%s' : %s" % (category, str(e))) # FIXME : i18n
return diagnosis_show(successes)
def diagnosis_ignore(category, args="", unignore=False): def diagnosis_ignore(category, args="", unignore=False):
pass pass
@ -132,8 +142,8 @@ class Diagnoser():
def report(self): def report(self):
if not self.args.get("force", False) and self.cached_time_ago() < self.cache_duration: if not self.args.get("force", False) and self.cached_time_ago() < self.cache_duration:
self.logger_debug("Using cached report from %s" % self.cache_file) self.logger_debug("Cache still valid : %s" % self.cache_file)
return Diagnoser.get_cached_report(self.id_) return
self.logger_debug("Running diagnostic for %s" % self.id_) self.logger_debug("Running diagnostic for %s" % self.id_)
@ -147,8 +157,6 @@ class Diagnoser():
self.logger_debug("Updating cache %s" % self.cache_file) self.logger_debug("Updating cache %s" % self.cache_file)
self.write_cache(new_report) self.write_cache(new_report)
return new_report
@staticmethod @staticmethod
def cache_file(id_): def cache_file(id_):
return os.path.join(DIAGNOSIS_CACHE, "%s.json" % id_) return os.path.join(DIAGNOSIS_CACHE, "%s.json" % id_)