From 388fd5019268bf0d3ba2fc0f8df501b42b9cf91c Mon Sep 17 00:00:00 2001
From: Frisk <furrtrex43@protonmail.ch>
Date: Tue, 15 Aug 2023 18:16:00 +0200
Subject: [PATCH] Fixes to debugging

---
 src/domain.py | 8 +++++---
 src/wiki.py   | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/domain.py b/src/domain.py
index ee18d8c..b676fe2 100644
--- a/src/domain.py
+++ b/src/domain.py
@@ -35,7 +35,9 @@ class Domain:
         return iter(self.wikis)
 
     def __str__(self) -> str:
-        return f"<Domain name='{self.name}' task='{self.task}' wikis='{self.wikis}' irc='{self.irc.connection.connected if self.irc else False}' failures={self.failures}>"
+        return (f"<Domain name='{self.name}' task='{self.task}' wikis='{self.wikis}' "
+                f"irc='{self.irc.connection.connected if self.irc else False}' failures={self.failures} "
+                f"calculated_delay={self.calculate_sleep_time(len(self)) if not self.irc else 'handled by IRC scheduler'}>")
 
     def __repr__(self):
         return self.__str__()
@@ -133,7 +135,7 @@ class Domain:
                 await self.run_wiki_scan(next(iter(self.wikis.values())))
         except Exception as e:
             if command_line_args.debug:
-                logger.exception("IRC task for domain {} failed!".format(self.name))
+                logger.exception("Regular scheduler task for domain {} failed!".format(self.name))
             else:
                 await self.send_exception_to_monitoring(e)
                 self.failures += 1
@@ -165,7 +167,7 @@ class Domain:
     async def send_exception_to_monitoring(self, ex: Exception):
         discord_message = DiscordMessage("embed", "generic", [""])
         discord_message["title"] = "Domain scheduler exception for {} (recovered)".format(self.name)
-        discord_message["content"] = traceback.format_exc(ex)[0:1995]
+        discord_message["content"] = "".join(traceback.format_exception(ex))[0:1995]
         discord_message.add_field("Failure count", str(self.failures))
         discord_message.finish_embed_message()
         header = settings["header"]
diff --git a/src/wiki.py b/src/wiki.py
index f2b99ed..b6f0957 100644
--- a/src/wiki.py
+++ b/src/wiki.py
@@ -232,6 +232,7 @@ class Wiki:
 			raise ServerError
 		# Catching HTTP errors
 		if 499 < request.status < 600:
+			logger.warning(f"A request to {self.script_url} {params} resulted in {request.status}")
 			raise ServerError
 		elif request.status == 302:
 			logger.critical(
@@ -273,6 +274,7 @@ class Wiki:
 																					url=self.client.WIKI_API_PATH + str(params)))
 			raise ServerError
 		if 499 < request.status_code < 600:
+			logger.warning(f"A request to {self.script_url} {params} resulted in {request.status}")
 			raise ServerError
 		elif request.status_code == 302:
 			logger.critical(