From e54e3666dd2be4c45b8d14491d1416ffdae1d923 Mon Sep 17 00:00:00 2001
From: deathbybandaid <sam@deathbybandaid.net>
Date: Mon, 6 May 2019 14:36:09 -0400
Subject: [PATCH] shutdown method breaks

---
 sopel_modules/SpiceBot_Events/Events.py | 23 +++++++++++++----------
 sopel_modules/SpiceBot_Logs/Logs.py     | 11 +++++++----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/sopel_modules/SpiceBot_Events/Events.py b/sopel_modules/SpiceBot_Events/Events.py
index 82b3af4..6b9b09a 100644
--- a/sopel_modules/SpiceBot_Events/Events.py
+++ b/sopel_modules/SpiceBot_Events/Events.py
@@ -50,16 +50,19 @@ def bot_events_connected(bot, trigger):
 
     bot_events_setup_check(bot)
 
-    while 'SpiceBot_Events' in bot.memory:
-        if len(bot.memory['SpiceBot_Events']["queue"]):
-            number = bot.memory['SpiceBot_Events']["queue"][0]["number"]
-            message = bot.memory['SpiceBot_Events']["queue"][0]["message"]
-            pretrigger = PreTrigger(
-                bot.nick,
-                ":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message
-            )
-            bot.dispatch(pretrigger)
-            del bot.memory['SpiceBot_Events']["queue"][0]
+    while True:
+        try:
+            if len(bot.memory['SpiceBot_Events']["queue"]):
+                number = bot.memory['SpiceBot_Events']["queue"][0]["number"]
+                message = bot.memory['SpiceBot_Events']["queue"][0]["message"]
+                pretrigger = PreTrigger(
+                    bot.nick,
+                    ":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message
+                )
+                bot.dispatch(pretrigger)
+                del bot.memory['SpiceBot_Events']["queue"][0]
+        except KeyError:
+            return
 
 
 @sopel.module.event('1004')
diff --git a/sopel_modules/SpiceBot_Logs/Logs.py b/sopel_modules/SpiceBot_Logs/Logs.py
index 951b595..de39744 100644
--- a/sopel_modules/SpiceBot_Logs/Logs.py
+++ b/sopel_modules/SpiceBot_Logs/Logs.py
@@ -53,10 +53,13 @@ def join_log_channel(bot, trigger):
 
         bot_logs_setup_check(bot)
 
-        while 'SpiceBot_Logs' in bot.memory:
-            if len(bot.memory['SpiceBot_Logs']["queue"]):
-                bot.say(str(bot.memory['SpiceBot_Logs']["queue"][0]), channel)
-                del bot.memory['SpiceBot_Logs']["queue"][0]
+        while True:
+            try:
+                if len(bot.memory['SpiceBot_Logs']["queue"]):
+                    bot.say(str(bot.memory['SpiceBot_Logs']["queue"][0]), channel)
+                    del bot.memory['SpiceBot_Logs']["queue"][0]
+            except KeyError:
+                return
 
 
 @sopel.module.event('2004')