nex/college-bot-v1
1
0
Fork 0
mirror of https://github.com/nexy7574/LCC-bot.git synced 2024-09-20 02:26:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make uptime monitoring more detailed

Browse source
This commit is contained in:
nex 2023-01-18 18:37:24 +00:00
parent 1a34a004d4
commit 8f4f616258
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cogs/uptime.py
View file

@ -1,7 +1,7 @@
import asyncio import asyncio
import datetime import datetime
from datetime import timedelta from datetime import timedelta
from typing import Dict from typing import Dict, Tuple
import discord import discord
import httpx import httpx
@ -61,6 +61,20 @@ class UptimeCompetition(commands.Cog):
assert response.status_code == 200 assert response.status_code == 200
assert response.text.strip() == "<!DOCTYPE html><html><body>Hello Jimmy!</body></html>" assert response.text.strip() == "<!DOCTYPE html><html><body>Hello Jimmy!</body></html>"
async def _test_url(self, url: str, max_retries: int = 10, timeout: int = 30) -> Tuple[int, Response | Exception]:
attempts = 1
err = RuntimeError("Unknown Error")
while attempts < max_retries:
try:
response = await self.http.get(url, timeout=timeout)
response.raise_for_status()
except (httpx.TimeoutException, httpx.HTTPStatusError) as err:
attempts += 1
continue
else:
return attempts, response
return attempts, err
async def do_test_uptimes(self): async def do_test_uptimes(self):
console.log("Testing uptimes...") console.log("Testing uptimes...")
# First we need to check that we are online. # First we need to check that we are online.
@ -79,23 +93,25 @@ class UptimeCompetition(commands.Cog):
kwargs: Dict[str, str | int | None] = { kwargs: Dict[str, str | int | None] = {
"target_id": key, "target_id": key,
"target": url, "target": url,
"notes": ""
} }
try: attempts, response = await self._test_url(url)
response = await self.http.get(url) if isinstance(response, Exception):
except httpx.HTTPError as e:
kwargs["is_up"] = False kwargs["is_up"] = False
kwargs["response_time"] = None kwargs["response_time"] = None
kwargs["notes"] = str(e) kwargs["notes"] += f"Failed to access page after {attempts:,} attempts: {response}"
else: else:
if attempts > 1:
kwargs["notes"] += f"After {attempts:,} attempts, "
try: try:
self.assert_uptime_server_response(response) self.assert_uptime_server_response(response)
except AssertionError as e: except AssertionError as e:
kwargs["is_up"] = False kwargs["is_up"] = False
kwargs["notes"] = str(e) kwargs["notes"] += "content was invalid: " + str(e)
else: else:
kwargs["is_up"] = True kwargs["is_up"] = True
kwargs["response_time"] = round(response.elapsed.total_seconds() * 1000) kwargs["response_time"] = round(response.elapsed.total_seconds() * 1000)
kwargs["notes"] = None kwargs["notes"] += "nothing notable."
create_tasks.append( create_tasks.append(
self.bot.loop.create_task( self.bot.loop.create_task(
UptimeEntry.objects.create( UptimeEntry.objects.create(
@ -135,7 +151,7 @@ class UptimeCompetition(commands.Cog):
target="SHRoNK Bot", target="SHRoNK Bot",
is_up=shronk_bot.status is not discord.Status.offline, is_up=shronk_bot.status is not discord.Status.offline,
response_time=None, response_time=None,
notes=None, notes="*Unable to monitor response time, not a HTTP request.*",
) )
) )
) )