diff options
-rw-r--r-- | bot/__main__.py | 2 | ||||
-rw-r--r-- | bot/constants.py | 4 | ||||
-rw-r--r-- | bot/exts/utils/ping.py | 2 | ||||
-rw-r--r-- | docker-compose.yml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/bot/__main__.py b/bot/__main__.py index 003cbbcda..8b640a370 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -66,7 +66,7 @@ async def main() -> None: intents=intents, allowed_roles=list({discord.Object(id_) for id_ in constants.MODERATION_ROLES}), api_client=APIClient( - site_api_url=f"{constants.URLs.site_api_scheme}{constants.URLs.site_api}", + site_api_url=constants.URLs.site_api, site_api_token=constants.Keys.site_api, ), ) diff --git a/bot/constants.py b/bot/constants.py index 67c21816a..b72a70c84 100644 --- a/bot/constants.py +++ b/bot/constants.py @@ -527,8 +527,7 @@ class _BaseURLs(EnvConfig): github_bot_repo = "https://github.com/python-discord/bot" # Site - site_api = "site.default.svc.cluster.local/api" - site_api_scheme = "http://" + site_api = "http://site.default.svc.cluster.local/api" site_paste = "https://paste.pythondiscord.com" @@ -547,6 +546,7 @@ class _URLs(_BaseURLs): paste_service: str = "".join([BaseURLs.site_paste, "/{key}"]) site_logs_view: str = "https://pythondiscord.com/staff/bot/logs" + URLs = _URLs() diff --git a/bot/exts/utils/ping.py b/bot/exts/utils/ping.py index 20e956e03..edac4ebca 100644 --- a/bot/exts/utils/ping.py +++ b/bot/exts/utils/ping.py @@ -38,7 +38,7 @@ class Latency(commands.Cog): bot_ping = f"{bot_ping:.{ROUND_LATENCY}f} ms" try: - async with self.bot.http_session.get(f"{URLs.site_api_scheme}{URLs.site_api}/healthcheck") as request: + async with self.bot.http_session.get(f"{URLs.site_api}/healthcheck") as request: request.raise_for_status() site_status = "Healthy" diff --git a/docker-compose.yml b/docker-compose.yml index 694f44507..5f3fbf5ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -113,7 +113,7 @@ services: - .env environment: API_KEYS_SITE_API: "badbot13m0n8f570f942013fc818f234916ca531" - URLS_SITE_API: "web:8000/api" + URLS_SITE_API: "http://web:8000/api" URLS_SNEKBOX_EVAL_API: "http://snekbox/eval" URLS_SNEKBOX_311_EVAL_API: "http://snekbox-311/eval" REDIS_HOST: "redis" |