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

Success for domains not about to expire

Browse source
This commit is contained in:
Alexandre Aubin 2020-04-29 02:43:37 +02:00
parent 76de0bb2e9
commit f22ac67468
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/hooks/diagnosis/12-dnsrecords.py
View file

@ -150,7 +150,7 @@ class DNSRecordsDiagnoser(Diagnoser):
"not_found": [], "not_found": [],
"error": [], "error": [],
"warning": [], "warning": [],
"info": [] "success": []
} }
for domain in domains: for domain in domains:
@ -169,7 +169,7 @@ class DNSRecordsDiagnoser(Diagnoser):
expire_in = expire_date - datetime.now() expire_in = expire_date - datetime.now()
alert_type = "info" alert_type = "success"
if expire_in <= timedelta(7): if expire_in <= timedelta(7):
alert_type = "error" alert_type = "error"
elif expire_in <= timedelta(30): elif expire_in <= timedelta(30):
@ -182,16 +182,15 @@ class DNSRecordsDiagnoser(Diagnoser):
} }
details[alert_type].append(("diagnosis_domain_expires_in", args)) details[alert_type].append(("diagnosis_domain_expires_in", args))
for alert_type in ["error", "warning", "not_found", "info"]: for alert_type in ["success", "error", "warning", "not_found"]:
if details[alert_type]: if details[alert_type]:
if alert_type == "not_found": if alert_type == "not_found":
meta = {"test": "domain_not_found"} meta = {"test": "domain_not_found"}
else: else:
meta = {"test": "domain_expiration"} meta = {"test": "domain_expiration"}
# Allow to ignor specifically a single domain # Allow to ignore specifically a single domain
if len(details[alert_type]) == 1: if len(details[alert_type]) == 1:
meta["domain"] = details[alert_type][0][1]["domain"] meta["domain"] = details[alert_type][0][1]["domain"]
meta["domain"] = details[alert_type][0][1]["domain"]
yield dict(meta=meta, yield dict(meta=meta,
data={}, data={},
status=alert_type.upper() if alert_type != "not_found" else "WARNING", status=alert_type.upper() if alert_type != "not_found" else "WARNING",

2
tests/test_i18n_keys.py
View file

@ -119,7 +119,7 @@ def find_expected_string_keys():
for level in ["danger", "thirdparty", "warning"]: for level in ["danger", "thirdparty", "warning"]:
yield "confirm_app_install_%s" % level yield "confirm_app_install_%s" % level
for errortype in ["not_found", "error", "warning", "info", "not_found_details"]: for errortype in ["not_found", "error", "warning", "success", "not_found_details"]:
yield "diagnosis_domain_expiration_%s" % errortype yield "diagnosis_domain_expiration_%s" % errortype
yield "diagnosis_domain_not_found_details" yield "diagnosis_domain_not_found_details"