From e438975b079ebf42087d1bb281cb6b421c98e115 Mon Sep 17 00:00:00 2001
From: Daniel Persson <daniel@silvertejp.org>
Date: Sun, 6 Oct 2024 00:59:20 +0200
Subject: [PATCH] Add logging in case of exceptions

To be able to debug failures.
---
 irc_bot.py        |  1 +
 marvin_actions.py | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/irc_bot.py b/irc_bot.py
index 52a80a3..28a1c2d 100755
--- a/irc_bot.py
+++ b/irc_bot.py
@@ -181,6 +181,7 @@ def readincoming(self):
             try:
                 shutil.move(filename, self.CONFIG["dirDone"])
             except Exception:
+                LOG.warning("Failed to move %s to %s. Deleting.", filename, self.CONFIG["dirDone"])
                 os.remove(filename)
 
     def mainLoop(self):
diff --git a/marvin_actions.py b/marvin_actions.py
index f362667..e472821 100644
--- a/marvin_actions.py
+++ b/marvin_actions.py
@@ -9,11 +9,13 @@
 import calendar
 import datetime
 import json
+import logging
 import random
 import requests
 
 from bs4 import BeautifulSoup
 
+LOG = logging.getLogger("action")
 
 def getAllActions():
     """
@@ -350,7 +352,8 @@ def marvinSun(row):
             msg = getString("sun", "msg").format(sunrise, sunset)
             return msg
 
-        except Exception:
+        except Exception as e:
+            LOG.error("Failed to get sun times: %s", e)
             return getString("sun", "error")
 
     return msg
@@ -371,7 +374,8 @@ def marvinWeather(row):
                 soup.h4.findNextSibling("p").text
             )
 
-        except Exception:
+        except Exception as e:
+            LOG.error("Failed to get weather: %s", e)
             msg = getString("smhi", "failed")
 
     return msg
@@ -485,7 +489,8 @@ def marvinBirthday(row):
             else:
                 msg = getString("birthday", "somebody").format(my_strings)
 
-        except Exception:
+        except Exception as e:
+            LOG.error("Failed to get birthday: %s", e)
             msg = getString("birthday", "error")
 
     return msg
@@ -507,7 +512,8 @@ def marvinNameday(row):
                 msg = getString("nameday", "somebody").format(",".join(names))
             else:
                 msg = getString("nameday", "nobody")
-        except Exception:
+        except Exception as e:
+            LOG.error("Failed to get nameday: %s", e)
             msg = getString("nameday", "error")
     return msg
 
@@ -553,7 +559,8 @@ def getJoke():
         r = requests.get(url, timeout=5)
         joke_data = r.json()
         return joke_data["value"]
-    except Exception:
+    except Exception as e:
+        LOG.error("Failed to get joke: %s", e)
         return getString("joke", "error")
 
 def marvinJoke(row):
@@ -575,7 +582,8 @@ def getCommit():
         res = r.text.strip()
         msg = f"Använd detta meddelandet: '{res}'"
         return msg
-    except Exception:
+    except Exception as e:
+        LOG.error("Failed to get commit message: %s", e)
         return getString("commit", "error")
 
 def marvinCommit(row):