diff --git a/src/stacosys/run.py b/src/stacosys/run.py index d311049..42d903c 100644 --- a/src/stacosys/run.py +++ b/src/stacosys/run.py @@ -46,13 +46,9 @@ def configure_and_validate_mailer(config, logger): config.get(ConfigParameter.SMTP_LOGIN), config.get(ConfigParameter.SMTP_PASSWORD), ) - mailer.configure_destination(config.get(ConfigParameter.SITE_ADMIN_EMAIL)) - try: - if not mailer.check(): - logger.error("Email configuration not working") - sys.exit(1) - except Exception as e: - logging.error("Failed to check email: %s", e) + mailer.configure_destination(config.get(ConfigParameter.SITE_ADMIN_EMAIL)) + if not mailer.check(): + logger.error("Email configuration not working") sys.exit(1) return mailer diff --git a/src/stacosys/service/rssfeed.py b/src/stacosys/service/rssfeed.py index c9bea05..9c9ebe0 100644 --- a/src/stacosys/service/rssfeed.py +++ b/src/stacosys/service/rssfeed.py @@ -1,15 +1,13 @@ #!/usr/bin/env python # -*- coding: UTF-8 -*- -from datetime import datetime, timezone +from datetime import datetime import markdown import PyRSS2Gen from stacosys.db import dao -RFC_822_FORMAT = '%a, %d %b %Y %H:%M:%S +0000' - class Rss: def __init__(self) -> None: @@ -42,7 +40,7 @@ class Rss: link=item_link, description=markdownizer.convert(row.content), guid=PyRSS2Gen.Guid(f"{item_link}{row.id}"), - pubDate=self._to_rfc822(row.published) + pubDate=row.published, ) ) @@ -56,7 +54,3 @@ class Rss: ) with open(self._rss_file, "w", encoding="utf-8") as outfile: rss.write_xml(outfile, encoding="utf-8") - - def _to_rfc822(self, dt): - return dt.replace(tzinfo=timezone.utc) \ - .strftime('%a, %d %b %Y %H:%M:%S %z')