diff --git a/.env.default b/.env.default index 88eb9e9..19dc321 100644 --- a/.env.default +++ b/.env.default @@ -1,4 +1,2 @@ APP_LIFECYCLE="dev" -SENTRY_ENABLED="False" -SENTRY_DSN="" WEBEX_API_KEY="" diff --git a/.gitignore b/.gitignore index 7f4045e..cee07d3 100644 --- a/.gitignore +++ b/.gitignore @@ -133,3 +133,6 @@ dmypy.json # IDE .vscode .idea + +# Ruff +.ruff_cache/ diff --git a/app/config.py b/app/config.py index f2a75e3..8b42d9a 100644 --- a/app/config.py +++ b/app/config.py @@ -11,11 +11,6 @@ class Config: self.__environment: str = os.environ.get("APP_LIFECYCLE", "DEV").upper() self.__version: str = os.environ["APP_VERSION"] self.__webex_token: str = os.environ["WEBEX_API_KEY"] - self.__sentry_dsn: str = os.environ.get("SENTRY_DSN", "") - self.__sentry_enabled: bool = bool( - os.environ.get("SENTRY_ENABLED", "False").upper() == "TRUE" - and self.__sentry_dsn != "" - ) @property def environment(self) -> str: @@ -27,19 +22,6 @@ class Config: """Returns the current app version.""" return self.__version - @property - def sentry_enabled(self) -> bool: - """Returns True if Sentry SDK is enabled, else False.""" - return self.__sentry_enabled - - @property - def sentry_dsn(self) -> str: - """Returns the Sentry DSN value if Sentry SDK is enabled AND - Sentry DSN is set, else blank string.""" - if not self.__sentry_enabled: - return "" - return self.__sentry_dsn - @property def webex_token(self) -> str: """Returns the Webex API key.""" diff --git a/app/img.py b/app/img.py index b59d8c5..6a5e19f 100644 --- a/app/img.py +++ b/app/img.py @@ -18,7 +18,7 @@ CHAR_REPLACEMENTS: list = [ def get_templates() -> list[dict]: url: str = "https://api.memegen.link/templates" - req: requests.Response = requests.get(url=url, timeout=5) + req: requests.Response = requests.get(url=url, timeout=10) req.raise_for_status() data: dict = req.json() templates: list = [] diff --git a/app/main.py b/app/main.py index 4e28ad4..d8bd01f 100644 --- a/app/main.py +++ b/app/main.py @@ -1,22 +1,10 @@ #!/usr/local/bin/python3 -import sentry_sdk -from sentry_sdk.integrations.stdlib import StdlibIntegration from webex_bot.webex_bot import WebexBot from app import close, meme from app.config import config -if config.sentry_enabled: - apm = sentry_sdk.init( - dsn=config.sentry_dsn, - enable_tracing=True, - environment=config.environment, - release=config.version, - integrations=[StdlibIntegration()], - spotlight=True, - ) - def create_bot() -> WebexBot: """Create a Bot object.""" diff --git a/tests/test_config.py b/tests/test_config.py index c90373e..2cf5fc4 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -5,8 +5,6 @@ import os vars: dict = { "APP_VERSION": "dev", "WEBEX_API_KEY": "testing", - "SENTRY_ENABLED": "false", - "SENTRY_DSN": "http://localhost", } @@ -20,4 +18,3 @@ from app.config import config # pragma: no cover # noqa: E402 def test_config() -> None: assert config.webex_token == vars["WEBEX_API_KEY"] assert config.version == vars["APP_VERSION"] - assert config.sentry_enabled == bool(vars["SENTRY_ENABLED"].lower() == "true")