cleanup some error messages

[erebus.git] / erebus.py

diff --git a/erebus.py b/erebus.py
index 12be844b4388acf1fd77980abb4731cb80eed7b5..a93e1e0ee17c90b5d3b6d7c96cd818bc0f1c38cd 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -124,6 +124,8 @@ class Erebus(object): #singleton to pass around
                        self.voices = []
                        self.ops = []
 
+                       self.deleting = False # if true, the bot will remove cached records of this channel when the bot sees that it has left the channel
+
                        c = main.query("SELECT user, level FROM chusers WHERE chan = %s", (self.name,))
                        if c:
                                row = c.fetchone()
@@ -424,7 +426,7 @@ def loop():
                try:
                        data = main.fd(fileno).getdata()
                except:
-                       main.log('*', '!', 'Super-mega-emergency: getdata raised exception for socket %d' % (fileno))
+                       main.log('*', '!', 'Error receiving data: getdata raised exception for socket %d, closing' % (fileno))
                        traceback.print_exc()
                        data = None
                if data is None:
@@ -436,7 +438,7 @@ def loop():
                                try:
                                        main.fd(fileno).parse(line)
                                except:
-                                       main.log('*', '!', 'Super-mega-emergency: parse raised exception for socket %d data %r' % (fileno, line))
+                                       main.log('*', '!', 'Error receiving data: parse raised exception for socket %d data %r, ignoring' % (fileno, line))
                                        traceback.print_exc()
        if main.mustquit is not None:
                main.log('*', '!', 'Core exiting due to: %s' % (main.mustquit))