fixed singlethread reloading, and functional database system (still no ORM usage)

This commit is contained in:
Luke Rogers 2014-02-15 18:50:22 +13:00
parent cdc9102694
commit 2ebb30d2d7
4 changed files with 16 additions and 9 deletions

View file

@ -110,7 +110,7 @@ class PluginLoader(object):
# stop all currently running instances of the plugins from this file
for func, handler in list(self.bot.threads.iteritems()):
if func._filename == filename:
main.handler.stop()
handler.stop()
del self.bot.threads[func]
self.rebuild()

View file

@ -124,12 +124,16 @@ class Handler(object):
break
if uses_db:
input.db = None
input.db = input.bot.db_session()
try:
run(self.bot, self.func, input)
except:
self.bot.logger.exception("Error in plugin {}:".format(self.func._filename))
finally:
if uses_db:
print "Closett"
input.db.close()
def stop(self):
self.input_queue.put(StopIteration)