#!/usr/bin/python
+# vim: fileencoding=utf-8
# Erebus IRC bot - Author: John Runyon
# main startup code
-import os, sys, select, MySQLdb, MySQLdb.cursors, time, random
+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 = 1
+ APIVERSION = 0
RELEASE = 0
bots = {}
if self.auth is None:
self.glevel = -1
else:
- c = main.db.cursor()
- if c.execute("SELECT level FROM users WHERE auth = %s", (self.auth,)):
+ c = main.query("SELECT level FROM users WHERE auth = %s", (self.auth,))
+ if c:
row = c.fetchone()
if row is not None:
self.glevel = row['level']
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):
self.voices = []
self.ops = []
- c = main.db.cursor()
- if c.execute("SELECT user, level FROM chusers WHERE chan = %s", (self.name,)):
+ c = main.query("SELECT user, level FROM chusers WHERE chan = %s", (self.name,))
+ if c:
row = c.fetchone()
while row is not None:
self.levels[row['user']] = row['level']
def setlevel(self, auth, level, savetodb=True):
auth = auth.lower()
if savetodb:
- c = main.db.cursor()
- if c.execute("REPLACE INTO chusers (chan, user, level) VALUES (%s, %s, %s)", (self.name, auth, level)):
+ c = main.query("REPLACE INTO chusers (chan, user, level) VALUES (%s, %s, %s)", (self.name, auth, level))
+ if c:
self.levels[auth] = level
return True
else:
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":
self.potype = "select"
self.fdlist = []
+ def query(self, *args, **kwargs):
+ if 'noretry' in kwargs:
+ noretry = kwargs['noretry']
+ del kwargs['noretry']
+ else:
+ 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:
+ curs = self.db.cursor()
+ res = curs.execute(*args, **kwargs)
+ if res:
+ return curs
+ else:
+ return res
+ except MySQLdb.MySQLError as e:
+ self.log("[SQL]", "!", "MySQL error! %r" % (e))
+ if not noretry:
+ dbsetup()
+ 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)
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()
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()
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.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):
return self.chanhandlers[chan]
-class MyCursor(MySQLdb.cursors.DictCursor):
- def execute(self, *args, **kwargs):
- main.log("[SQL]", "?", "MyCursor.execute(self, %s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs])))
-# print "%09.3f [SQL] [#] MyCursor.execute(self, %s, %s)" % (time.time() % 100000, ', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs]))
- try:
- return super(self.__class__, self).execute(*args, **kwargs)
- except MySQLdb.MySQLError as e:
- main.log("[SQL]", "!", "MySQL error! %r" % (e))
-# print "%09.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
- dbsetup()
- return False
- return True
-
-
def dbsetup():
main.db = None
- main.db = MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MyCursor)
+ 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.Config('bot.config')
+ if cfg.getboolean('debug', 'gc'):
+ gc.set_debug(gc.DEBUG_LEAK)
+
pidfile = open(cfg.pidfile, 'w')
pidfile.write(str(os.getpid()))
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.db.cursor()
- if c.execute("SELECT nick, user, bind, authname, authpass FROM bots WHERE active = 1"):
+ c = main.query("SELECT nick, user, bind, authname, authpass FROM bots WHERE active = 1")
+ if c:
rows = c.fetchall()
c.close()
for row in rows:
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()))
projects / erebus.git / blobdiff