TODO

[erebus.git] / erebus.py

diff --git a/erebus.py b/erebus.py
index 524b9a451ae589f825635b353800316acdbfb986..0377d92ded68ae4014a3546e917048ec4303bb2d 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -1,13 +1,16 @@
 #!/usr/bin/python
+# vim: fileencoding=utf-8
 
 # Erebus IRC bot - Author: John Runyon
 # main startup code
 
+from __future__ import print_function
+
 import os, sys, select, MySQLdb, MySQLdb.cursors, time, random, gc
 import bot, config, ctlmod
 
 class Erebus(object): #singleton to pass around
-       APIVERSION = 2
+       APIVERSION = 0
        RELEASE = 0
 
        bots = {}
@@ -69,7 +72,7 @@ class Erebus(object): #singleton to pass around
                        self.nick = newnick
 
                def __str__(self): return self.nick
-               def __repr__(self): return "<User %r (%d)>" % (self.nick,self.glevel)
+               def __repr__(self): return "<User %r (%d)>" % (self.nick, self.glevel)
 
        class Channel(object):
                def __init__(self, name, bot):
@@ -137,6 +140,8 @@ class Erebus(object): #singleton to pass around
                def __repr__(self): return "<Channel %r>" % (self.name)
 
        def __init__(self, cfg):
+               self.mustquit = None
+               self.starttime = time.time()
                self.cfg = cfg
                self.trigger = cfg.trigger
                if os.name == "posix":
@@ -147,11 +152,11 @@ class Erebus(object): #singleton to pass around
                        self.fdlist = []
 
        def query(self, *args, **kwargs):
-               if 'norecurse' in kwargs:
-                       norecurse = kwargs['norecurse']
-                       del kwargs['norecurse']
+               if 'noretry' in kwargs:
+                       noretry = kwargs['noretry']
+                       del kwargs['noretry']
                else:
-                       norecurse = False
+                       noretry = False
 
                self.log("[SQL]", "?", "query(%s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs])))
                try:
@@ -163,12 +168,17 @@ class Erebus(object): #singleton to pass around
                                return res
                except MySQLdb.MySQLError as e:
                        self.log("[SQL]", "!", "MySQL error! %r" % (e))
-                       if not norecurse:
+                       if not noretry:
                                dbsetup()
-                               return self.query(*args, norecurse=True, **kwargs)
+                               return self.query(*args, noretry=True, **kwargs)
                        else:
                                raise e
 
+       def querycb(self, cb, *args, **kwargs):
+               def run_query():
+                       cb(self.query(*args, **kwargs))
+               threading.Thread(target=run_query).start()
+
        def newbot(self, nick, user, bind, authname, authpass, server, port, realname):
                if bind is None: bind = ''
                obj = bot.Bot(self, nick, user, bind, authname, authpass, server, port, realname)
@@ -186,7 +196,7 @@ class Erebus(object): #singleton to pass around
        def fd(self, fileno): #get Bot() by fd/fileno
                return self.fds[fileno]
        def randbot(self): #get Bot() randomly
-               return self.bots[random.choice(self.bots.keys())]
+               return self.bots[random.choice(list(self.bots.keys()))]
 
        def user(self, _nick, justjoined=False, create=True):
                nick = _nick.lower()
@@ -214,13 +224,15 @@ class Erebus(object): #singleton to pass around
                return chan
 
        def poll(self):
+               timeout_seconds = 30
                if self.potype == "poll":
-                       return [fd for (fd, ev) in self.po.poll()]
+                       pollres = self.po.poll(timeout_seconds * 1000)
+                       return [fd for (fd, ev) in pollres]
                elif self.potype == "select":
-                       return select.select(self.fdlist, [], [])[0]
+                       return select.select(self.fdlist, [], [], timeout_seconds)[0]
 
        def connectall(self):
-               for bot in self.bots.itervalues():
+               for bot in self.bots.values():
                        if bot.conn.state == 0:
                                bot.connect()
 
@@ -228,10 +240,17 @@ class Erebus(object): #singleton to pass around
                return ctlmod.modules[name]
 
        def log(self, source, level, message):
-               print "%09.3f %s [%s] %s" % (time.time() % 100000, source, level, message)
+               print("%09.3f %s [%s] %s" % (time.time() % 100000, source, level, message))
 
        def getuserbyauth(self, auth):
-               return [u for u in self.users.itervalues() if u.auth == auth.lower()]
+               return [u for u in self.users.values() if u.auth == auth.lower()]
+
+       def getdb(self):
+               """Get a DB object. The object must be returned to the pool after us, using returndb()."""
+               return self.dbs.pop()
+
+       def returndb(self, db):
+               self.dbs.append(db)
 
        #bind functions
        def hook(self, word, handler):
@@ -276,12 +295,15 @@ class Erebus(object): #singleton to pass around
 
 def dbsetup():
        main.db = None
+       main.dbs = []
+       for i in range(cfg.get('erebus', 'num_db_connections', 2)-1):
+               main.dbs.append(MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor))
        main.db = MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor)
 
 def setup():
        global cfg, main
 
-       cfg = config.setup('bot.config')
+       cfg = config.Config('bot.config')
 
        if cfg.getboolean('debug', 'gc'):
                gc.set_debug(gc.DEBUG_LEAK)
@@ -291,12 +313,12 @@ def setup():
        pidfile.close()
 
        main = Erebus(cfg)
+       dbsetup()
 
        autoloads = [mod for mod, yes in cfg.items('autoloads') if int(yes) == 1]
        for mod in autoloads:
                ctlmod.load(main, mod)
 
-       dbsetup()
        c = main.query("SELECT nick, user, bind, authname, authpass FROM bots WHERE active = 1")
        if c:
                rows = c.fetchall()
@@ -310,6 +332,9 @@ def loop():
        for fileno in poready:
                for line in main.fd(fileno).getdata():
                        main.fd(fileno).parse(line)
+       if main.mustquit is not None:
+               main.log('*', '!', 'Core exiting due to: %s' % (main.mustquit))
+               raise main.mustquit
 
 if __name__ == '__main__':
        try: os.rename('logfile', 'oldlogs/%s' % (time.time()))