diff --git a/discord_rss_bot/feeds.py b/discord_rss_bot/feeds.py index 641bd89..31de1dd 100644 --- a/discord_rss_bot/feeds.py +++ b/discord_rss_bot/feeds.py @@ -165,7 +165,7 @@ def send_to_discord(feed=None) -> None: raise try: - webhook_url: str = str(reader.get_tag(entry.feed.url, "webhook")) + webhook_url: str = str(reader.get_tag(entry.feed_url, "webhook")) except TagNotFoundError: logger.error("Tag not found", exc_info=True) raise diff --git a/discord_rss_bot/main.py b/discord_rss_bot/main.py index 6fb61a6..6a90530 100644 --- a/discord_rss_bot/main.py +++ b/discord_rss_bot/main.py @@ -37,7 +37,7 @@ from fastapi import FastAPI, Form, HTTPException, Request from fastapi.responses import FileResponse, HTMLResponse from fastapi.staticfiles import StaticFiles from fastapi.templating import Jinja2Templates -from reader import EntryCounts, Feed, FeedCounts, ResourceNotFoundError +from reader import EntryCounts, Feed, FeedCounts, ReaderError, ResourceNotFoundError from starlette.templating import _TemplateResponse from tomlkit.toml_document import TOMLDocument @@ -254,8 +254,14 @@ def shutdown() -> None: It stops the scheduler.""" scheduler: BackgroundScheduler = BackgroundScheduler() scheduler.shutdown() + logger.info("Scheduler stopped.") - reader.close() + try: + reader.close() + except ReaderError: + logger.error("Error closing reader.", exc_info=True) + sys.exit() + logger.info("Reader closed.") if __name__ == "__main__":