core - add exception hooks

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index c727d7257810a47f108792ec4fcc62823f165f35..3ce39474d39452f673493faacfe35a72450bb3be 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -4,7 +4,7 @@
 # Erebus IRC bot - Author: John Runyon
 # "Bot" and "BotConnection" classes (handling a specific "arm")
 
-import socket, sys, time, threading, os, random, struct
+import os, random, socket, struct, sys, threading, time, traceback
 from collections import deque
 
 if sys.version_info.major < 3:
@@ -134,7 +134,7 @@ class Bot(object):
                                try:
                                        callback(self, line)
                                except Exception:
-                                       self.__debug_cbexception("numhook", line)
+                                       self._cbexception("numhook", line)
 
                if numeric in dispatch:
                        dispatch[numeric](pieces)
@@ -299,12 +299,19 @@ class Bot(object):
                        else:
                                pass # don't care about other modes
 
-       def __debug_cbexception(self, source, *args, **kwargs):
+       def _cbexception(self, source, *args, chained=False, **kwargs):
+               if not chained: # skip hooks if we were caused by a hook
+                       exc = sys.exception()
+                       if self.parent.hasexceptionhook(exc):
+                               for callback in self.parent.getexceptionhook(exc):
+                                       try:
+                                               callback(self, exc, source, *args, **kwargs)
+                                       except Exception:
+                                               self._cbexception('exceptionhook', chained=True, module=callback.__module__, function=callback.__name__, underlying=(source, args, kwargs))
                if self.parent.cfg.getboolean('debug', 'cbexc'):
                        self.conn.send("PRIVMSG %s :%09.3f \ 34\1f!!! CBEXC\1f\ 3 %s" % (self.parent.cfg.get('debug', 'owner'), time.time() % 100000, source))
-                       __import__('traceback').print_exc()
+                       traceback.print_exc(chain=not chained)
                        self.log('!', "CBEXC %s %r %r" % (source, args, kwargs))
-#                      print "%09.3f %s [!] CBEXC %s %r %r" % (time.time() % 100000, self.nick, source, args, kwargs)
 
 
        def parsemsg(self, user, target, msg):
@@ -355,7 +362,7 @@ class Bot(object):
                                                                self.reply(target, user, cbret)
                                                except:
                                                        self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000))
-                                                       self.__debug_cbexception("chanhook", user=user, target=target, msg=msg)
+                                                       self._cbexception("chanhook", user=user, target=target, msg=msg)
                                return # not to bot, don't process!
 
                cmd = pieces[0].lower()
@@ -376,7 +383,7 @@ class Bot(object):
                                                        self.reply(target, user, cbret)
                                        except Exception:
                                                self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000))
-                                               self.__debug_cbexception("hook", user=user, target=target, msg=msg)
+                                               self._cbexception("hook", user=user, target=target, msg=msg)
                                        except SystemExit as e:
                                                self.parent.mustquit = e
                                                try:
@@ -395,7 +402,7 @@ class Bot(object):
                        self.conn.send("PRIVMSG %s :%09.3f \ 34\1f!!! NOMSG\1f\ 3 %r, %r" % (self.parent.cfg.get('debug', 'owner'), time.time() % 100000, target, msg))
                        self.log('!', "!!! NOMSG")
 #                      print "%09.3f %s [!] %s" % (time.time() % 100000, self.nick, "!!! NOMSG")
-                       __import__('traceback').print_stack()
+                       traceback.print_stack()
 
 
        def reply(self, chan, user, msg):