Database/Constraints.py Database/Fields.py Database/Matches.py Database/__init__.py @@ -1,10 +1,17 @@ # -*- coding: utf-8 -*- -from Pointything.Database import * +import Database + +class UserTable(Database.Table): + def __init__(self): + Database.Table.__init__(self, "users") + self.addField(Database.Fields.Integer("user_id").addConstraint(Database.Constraints.PrimaryKey()).addConstraint(Database.Constraints.AutoIncrement())) + self.addField(Database.Fields.Text("login")) + self.addField(Database.Fields.Text("password")) class User: def __init__(self, id): - db = Database(); - u = db.find("users", "user_id", id) + tbl = UserTable() + u = tbl.select(tbl.fields(), (Database.Matches.Equals(tbl["user_id"], id),)) data = u.fetchone() self.data = {} for idx, cell in enumerate(u.description): @@ -19,8 +26,8 @@ class User: @staticmethod def login(login, password): - db = Database(); - u = db.query("select user_id from users where login = ? and password = ?", (login, password)) + tbl = UserTable() + u = tbl.select((tbl["user_id"],), (Database.Matches.Equals(tbl["login"], login), Database.Matches.Equals(tbl["password"], password))) u = u.fetchone() if u == None: return User(0) Pointything/Auth.py @@ -21,6 +21,9 @@ class Extension: if hasattr(m,'action_name'): ret.append(m) return ret + + def unloaded(self): + pass def Action(name=None): if type(name)==str: Pointything/Extensions.py @@ -5,11 +5,10 @@ import sys import select import logging import __builtin__ -import Database import traceback class ExtensionControl(Extension): - '''Extension to control the extensions''' + '''Extension to control the extensions. Thats deep, man.''' extension_name = "extensionControl" def __init__(self, bot): Extension.__init__(self, bot) @@ -113,12 +112,20 @@ class Pointything: out = traceback.format_exception(exceptionType, exceptionValue, exceptionTraceback) for line in out: self.log.error(line.strip()) + self.log.info("Exiting main loop.") + self.cleanup() + + def cleanup(self): + self.log.debug("Cleaning up modules...") + extList = self.extensions.copy() + for m in extList: + self.unloadExtension(self.extensions[m]) def extendWith(self, ext): log = logging.getLogger("Pointything.extensions") log.info("Loading extension %s", ext.extension_name) - self.unloadExtension(ext) extInstance = ext(self) + #self.unloadExtension(ext) self.extensions[ext.extension_name]=extInstance for cmd in extInstance.userMethods(): self.commands[ext.extension_name+"."+cmd.action_name] = cmd @@ -142,4 +149,5 @@ class Pointything: del self.extensions[ext.extension_name] if ext in self.inputs: log.info("Detatching input %s", ext.extension_name) - self.inputs.remove(ext) \ No newline at end of file + self.inputs.remove(ext) + ext.unloaded() \ No newline at end of file Pointything/__init__.py @@ -1,32 +1,58 @@ # -*- coding: utf-8 -*- from Pointything.Extensions import * -from Pointything.Database import * from Pointything.Auth import * import socket import threading import traceback import sys +import atexit + +class TelnetListener(threading.Thread): + def __init__(self, handler): + threading.Thread.__init__(self) + self.running = False + self.handler = handler + self.daemon = True + self.handler.log.info("Listening on *:16161") + self.server = socket.socket() + self.server.bind(("0.0.0.0", 16161)) + self.server.listen(1) + + def run(self): + self.handler.log.debug("Starting listener thread") + self.running = True + self.server.settimeout(3) + while self.running == True: + try: + (sock, addr) = self.server.accept() + self.handler.clients.append(sock) + self.handler.buffers[sock] = "" + self.handler.log.info("Accepted client %s",addr) + except socket.timeout: + pass + self.server.close() + + def kill(self): + self.running = False class TelnetInput(InputHandler): extension_name="Telnet" def __init__(self, bot): InputHandler.__init__(self, bot) - self.log.info("Listening on *:16161") - self.server = socket.socket() - self.server.bind(("0.0.0.0", 16161)) - self.server.listen(1) self.clients = [] self.buffers = {} - self.listenThread = threading.Thread(target=self.acceptLoop) - self.log.debug("Starting listener thread") + self.listenThread = TelnetListener(self) self.listenThread.start() + + def unloaded(self): + self.stopListener(); + for s in self.clients: + s.close() - def acceptLoop(self): - while True: - (sock, addr) = self.server.accept() - self.clients.append(sock) - self.buffers[sock] = "" - self.log.info("Accepted client %s",addr) + def stopListener(self): + self.log.info("Shutting down listener thread...") + self.listenThread.kill() + self.listenThread.join() def parse(self, bot, stream): lineBuffer = self.buffers[stream] Pointything/modules/Telnet.py @@ -8,5 +8,7 @@ if __name__ == "__main__": logging.basicConfig(level=logging.DEBUG) pthang = Pointything.Pointything() pthang.do("loadModule", "Telnet") - #pthang.extendWith(TelnetInput) - pthang.run() \ No newline at end of file + try: + pthang.run() + except KeyboardInterrupt: + pthang.cleanup() \ No newline at end of file main.py Pointything/Database.py 7737ca98d0edf20fd977b5c8b15adad038278261 Trever Fischer wm161@wm161.net http://github.com/workman161/pointything/commit/1d331a8b2bf5740f9ef47b0ef95cb86fc70ff72e 1d331a8b2bf5740f9ef47b0ef95cb86fc70ff72e 2008-12-08T18:12:09-08:00 2008-12-08T18:12:09-08:00 The Telnet module exits the listener thread when the main thread exits The database system was rewritten. Now, schema is coded right into the system. 121ade5a50b1207fcb76a2b8193725bcf2a023ee Trever Fischer wm161@wm161.net