diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 27145cc..0d799ba 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,10 @@
-
-
+
+
+
+
@@ -78,7 +80,7 @@
-
+
@@ -192,7 +194,23 @@
1704578625479
-
+
+
+ 1704578853090
+
+
+
+ 1704578853090
+
+
+
+ 1704579168064
+
+
+
+ 1704579168064
+
+
@@ -214,6 +232,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/src/cogs/screenshot.py b/src/cogs/screenshot.py
index 4b11e65..61c109d 100644
--- a/src/cogs/screenshot.py
+++ b/src/cogs/screenshot.py
@@ -8,6 +8,7 @@ import time
from urllib.parse import urlparse
import discord
+import selenium.common
from discord.ext import commands
from PIL import Image
from selenium import webdriver
@@ -123,6 +124,11 @@ class ScreenshotCog(commands.Cog):
start_request = time.time()
try:
await asyncio.to_thread(driver.get, url)
+ except selenium.common.WebDriverException as e:
+ 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 ctx.respond("Failed to get the webpage: " + str(e))
raise
diff --git a/src/main.py b/src/main.py
index e974ec8..274c18f 100644
--- a/src/main.py
+++ b/src/main.py
@@ -13,7 +13,7 @@ log = logging.getLogger("jimmy")
CONFIG.setdefault("logging", {})
logging.basicConfig(
- format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ format="%(asctime)s %(levelname)s %(name)s: %(message)s",
datefmt="%Y-%m-%d %H:%M:%S",
level=CONFIG["logging"].get("level", "INFO"),
handlers=[