Compare commits

..

No commits in common. "d47f444ba759b59d3166945fd743384a500b3abf" and "0ea85ff307637d5bfeb42c8e5f509301a21e93f5" have entirely different histories.

2 changed files with 5 additions and 15 deletions

View file

@ -46,13 +46,9 @@ def configure_and_validate_mailer(config, logger):
config.get(ConfigParameter.SMTP_LOGIN), config.get(ConfigParameter.SMTP_LOGIN),
config.get(ConfigParameter.SMTP_PASSWORD), config.get(ConfigParameter.SMTP_PASSWORD),
) )
mailer.configure_destination(config.get(ConfigParameter.SITE_ADMIN_EMAIL)) mailer.configure_destination(config.get(ConfigParameter.SITE_ADMIN_EMAIL))
try: if not mailer.check():
if not mailer.check(): logger.error("Email configuration not working")
logger.error("Email configuration not working")
sys.exit(1)
except Exception as e:
logging.error("Failed to check email: %s", e)
sys.exit(1) sys.exit(1)
return mailer return mailer

View file

@ -1,15 +1,13 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: UTF-8 -*- # -*- coding: UTF-8 -*-
from datetime import datetime, timezone from datetime import datetime
import markdown import markdown
import PyRSS2Gen import PyRSS2Gen
from stacosys.db import dao from stacosys.db import dao
RFC_822_FORMAT = '%a, %d %b %Y %H:%M:%S +0000'
class Rss: class Rss:
def __init__(self) -> None: def __init__(self) -> None:
@ -42,7 +40,7 @@ class Rss:
link=item_link, link=item_link,
description=markdownizer.convert(row.content), description=markdownizer.convert(row.content),
guid=PyRSS2Gen.Guid(f"{item_link}{row.id}"), 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: with open(self._rss_file, "w", encoding="utf-8") as outfile:
rss.write_xml(outfile, encoding="utf-8") 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')