From 40b58132d488bab962d8aeecfc932a1cb5842a85 Mon Sep 17 00:00:00 2001
From: Hassan Abouelela <hassan@hassanamr.com>
Date: Fri, 12 Nov 2021 06:19:59 +0400
Subject: Move Sentry Into Init

Moves the sentry setup to be one of the very first things run during
startup, so we are able to catch more errors, such as ones that might
occur while setting up logs.

Signed-off-by: Hassan Abouelela <hassan@hassanamr.com>
---
 bot/__main__.py | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'bot/__main__.py')

diff --git a/bot/__main__.py b/bot/__main__.py
index c6e5fa57..6889fe2b 100644
--- a/bot/__main__.py
+++ b/bot/__main__.py
@@ -1,28 +1,10 @@
 import logging
 
-import sentry_sdk
-from sentry_sdk.integrations.logging import LoggingIntegration
-from sentry_sdk.integrations.redis import RedisIntegration
-
 from bot.bot import bot
-from bot.constants import Client, GIT_SHA, STAFF_ROLES, WHITELISTED_CHANNELS
+from bot.constants import Client, STAFF_ROLES, WHITELISTED_CHANNELS
 from bot.utils.decorators import whitelist_check
 from bot.utils.extensions import walk_extensions
 
-sentry_logging = LoggingIntegration(
-    level=logging.DEBUG,
-    event_level=logging.WARNING
-)
-
-sentry_sdk.init(
-    dsn=Client.sentry_dsn,
-    integrations=[
-        sentry_logging,
-        RedisIntegration()
-    ],
-    release=f"sir-lancebot@{GIT_SHA}"
-)
-
 log = logging.getLogger(__name__)
 
 bot.add_check(whitelist_check(channels=WHITELISTED_CHANNELS, roles=STAFF_ROLES))
-- 
cgit v1.2.3


From 58e33b1b3dbf623ac4e7796a392dd8446b809744 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Sun, 20 Feb 2022 12:20:24 +0000
Subject: Don't call bot.run() if IN_CI env var is set

---
 bot/__main__.py  | 3 ++-
 bot/constants.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'bot/__main__.py')

diff --git a/bot/__main__.py b/bot/__main__.py
index 6889fe2b..0bf7b398 100644
--- a/bot/__main__.py
+++ b/bot/__main__.py
@@ -12,4 +12,5 @@ bot.add_check(whitelist_check(channels=WHITELISTED_CHANNELS, roles=STAFF_ROLES))
 for ext in walk_extensions():
     bot.load_extension(ext)
 
-bot.run(Client.token)
+if not Client.in_ci:
+    bot.run(Client.token)
diff --git a/bot/constants.py b/bot/constants.py
index b4d7bc24..5d876d97 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -143,6 +143,7 @@ class Client(NamedTuple):
     prefix = environ.get("PREFIX", ".")
     token = environ.get("BOT_TOKEN")
     debug = environ.get("BOT_DEBUG", "true").lower() == "true"
+    in_ci = environ.get("IN_CI", "false").lower() == "true"
     github_bot_repo = "https://github.com/python-discord/sir-lancebot"
     # Override seasonal locks: 1 (January) to 12 (December)
     month_override = int(environ["MONTH_OVERRIDE"]) if "MONTH_OVERRIDE" in environ else None
-- 
cgit v1.2.3