urls - beautifulsoup: use encoding from Content-Type if available

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 451786b6eff0cf8e2722989afc8d79fcdfc0da56..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:
@@ -71,6 +71,7 @@ class Bot(object):
                        self.parse("ERROR :Fake-error from watchdog timer.")
                if self.conn.registered():
                        self.conn.send("PING :%s" % (time.time()))
+                       self._checknick()
                watchdogtimer = MyTimer(int(self.parent.cfg.get('watchdog', 'interval', default=30)), self.watchdog)
                watchdogtimer.start()
 
@@ -80,6 +81,7 @@ class Bot(object):
        def connect(self):
                self.log('!', "Connecting")
                if self.conn.connect():
+                       self.log('!', "Connected")
                        self.parent.newfd(self, self.conn.socket.fileno())
 
        def getdata(self):
@@ -88,7 +90,7 @@ class Bot(object):
                        self.lastreceived = time.time()
                        return recvd
                except EOFError as e:
-                       return ":%s ERROR :%s%r" % (self.nick, e.__class__.__name__, e.args)
+                       return [":%s ERROR :%s%r" % (self.nick, e.__class__.__name__, e.args)]
 
        def _checknick(self): # check if we're using the right nick, try changing
                if self.nick != self.permnick and self.conn.registered():
@@ -132,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)
@@ -145,15 +147,19 @@ class Bot(object):
                self._checknick()
        def _goterror(self, pieces):
                # TODO: better handling, just reconnect that single bot
-               self.parent.mustquit = Exception(' '.join(pieces))
+               error = ' '.join(pieces)
                try:
-                       self.quit("Error detected: %s" % ' '.join(pieces))
+                       raise Exception(error)
+               except Exception as e:
+                       self.parent.mustquit = e
+               try:
+                       self.quit("Error detected: %s" % (error))
                except: pass
                try:
                        curs = self.parent.query("UPDATE bots SET connected = 0")
                        curs.close()
                except: pass
-               sys.exit(2)
+               self.log('!', 'Bot exiting due to: %s' % (error))
        def _got001(self, pieces):
                # We wait until the end of MOTD instead to consider ourselves registered, but consider uptime as of 001
                self.connecttime = time.time()
@@ -293,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):
@@ -349,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()
@@ -370,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:
@@ -389,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):
@@ -553,10 +566,16 @@ class BotConnection(object):
        def _write(self, line):
                self.socket.sendall(line.encode('utf-8', 'backslashreplace')+b"\r\n")
 
+       def _getsockerr(self):
+               try: # SO_ERROR might not exist on all platforms
+                       return self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
+               except:
+                       return None
+
        def read(self):
                recvd = self.socket.recv(8192)
-               if recvd == "":
-                       raise EOFError("socket.recv in %s returned empty" % (self.parent.nick))
+               if recvd == b"":
+                       raise EOFError("socket.recv returned empty", self.parent.nick, self._getsockerr())
                self.buffer += recvd
                lines = []