diff --git a/mailservice.py b/mailservice.py index 1750989de6d821a59f4795fb06ba75fff065bc33..bb46296091e22dfe5f451b71072dcc7a8782dc6b 100644 --- a/mailservice.py +++ b/mailservice.py @@ -92,16 +92,19 @@ def main(end): msg = EmailMessage() msg["Subject"] = "Subtitle Service Error Report" msg["From"] = config["MAIL"]["FROM"] - msg["To"] = config["MONITORING"]["MAIL"] + msg["To"] = config["MONITORING_MAIL"] job_uuids = [] for job in error_jobs: job_uuids.append(Path(job).name) msg.set_content( - "The following jobs currently have errors:\n{}".format("\n - ".join(job_uuids)) + "The following jobs currently have errors:\n\n - {}".format("\n - ".join(job_uuids)) ) + s.send_message(msg) + sent += 1 + except KeyError: pass @@ -122,7 +125,7 @@ def main(end): pass print( - "[MAILSERVICE] Sent {} mails. Sleeping for {} seconds.".format( + "[MAILSERVICE] Sent {} mail(s). Sleeping for {} seconds.".format( sent, config["MAILSERVICE_INTERVAL"] ) )