nex/college-bot-v2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

Properly cleanup chromedriver

Browse source
This commit is contained in:
Nexus 2024-01-15 10:51:53 +00:00
parent 827e24acc6
commit f759f9ddb2
Signed by: nex
GPG key ID: 0FA334385D0B689F
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -45,7 +45,7 @@ libnss3 \
lsb-release \
xdg-utils
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
traceroute \
iputils-ping \
dnsutils \

5
src/cogs/screenshot.py
View file

@ -127,11 +127,13 @@ class ScreenshotCog(commands.Cog):
try:
await asyncio.to_thread(driver.get, url)
except selenium.common.WebDriverException as e:
await self.bot.loop.run_in_executor(None, driver.quit)
if "TimeoutException" in str(e):
return await ctx.respond("Timed out while loading webpage.")
else:
return await ctx.respond("Failed to load webpage:\n```\n%s\n```" % str(e.msg))
except Exception as e:
await self.bot.loop.run_in_executor(None, driver.quit)
await ctx.respond("Failed to get the webpage: " + str(e))
raise
end_request = time.time()
@ -165,8 +167,7 @@ class ScreenshotCog(commands.Cog):
await ctx.edit(content="Cleaning up...")
start_cleanup = time.time()
await asyncio.to_thread(driver.close)
await asyncio.to_thread(driver.quit)
await self.bot.loop.run_in_executor(None, driver.quit)
end_cleanup = time.time()
screenshot_size_mb = round(len(await asyncio.to_thread(file.getvalue)) / 1024 / 1024, 2)