summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-09-05 22:40:46 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-09-05 22:40:46 +0200
commita52e07d9047b0f41c16e51e083cc8639eaa88328 (patch)
tree12ad67511c03b639486d7d7f1eb73f72e1433978 /modules
parentaba29f23e65e61be194477df1e25fd355ca4dd65 (diff)
downloadcurunir-a52e07d9047b0f41c16e51e083cc8639eaa88328.tar
curunir-a52e07d9047b0f41c16e51e083cc8639eaa88328.zip
Changed log backend to PostgreSQL
Diffstat (limited to 'modules')
-rw-r--r--modules/log.py22
-rw-r--r--modules/pgsql.py30
2 files changed, 43 insertions, 9 deletions
diff --git a/modules/log.py b/modules/log.py
index ff8093e..74e813a 100644
--- a/modules/log.py
+++ b/modules/log.py
@@ -3,27 +3,31 @@ from . import ModuleBase
class Module(ModuleBase):
def __init__(self, manager):
ModuleBase.__init__(self, manager)
- self.mysql = manager.get('mysql')
+ self.pgsql = manager.get('pgsql')
def helptexts(self):
return ['Chatlogs werden auch erstellt.']
def groupchat(self, room, nick, text, handler):
- cursor = self.mysql.cursor()
- cursor.execute('INSERT INTO log (`type`, `time`, `room`, `nick`, `text`) VALUES ("message", NOW(), %s, %s, %s)', (room, nick, text))
+ cursor = self.pgsql.cursor()
+ cursor.execute('INSERT INTO log ("type", "time", "room", "nick", "text") VALUES (\'message\', now(), %s, %s, %s)', (room, nick, text))
cursor.close()
+ self.pgsql.commit()
def join(self, room, nick, show, status, handler):
- cursor = self.mysql.cursor()
- cursor.execute('INSERT INTO log (`type`, `time`, `room`, `nick`, `show`, `text`) VALUES ("join", NOW(), %s, %s, %s, %s)', (room, nick, show, status))
+ cursor = self.pgsql.cursor()
+ cursor.execute('INSERT INTO log ("type", "time", "room", "nick", "show", "text") VALUES (\'join\', now(), %s, %s, %s, %s)', (room, nick, show, status))
cursor.close()
+ self.pgsql.commit()
def leave(self, room, nick, show, status, handler):
- cursor = self.mysql.cursor()
- cursor.execute('INSERT INTO log (`type`, `time`, `room`, `nick`, `show`, `text`) VALUES ("leave", NOW(), %s, %s, %s, %s)', (room, nick, show, status))
+ cursor = self.pgsql.cursor()
+ cursor.execute('INSERT INTO log ("type", "time", "room", "nick", "show", "text") VALUES (\'leave\', now(), %s, %s, %s, %s)', (room, nick, show, status))
cursor.close()
+ self.pgsql.commit()
def topic(self, room, nick, text, handler):
- cursor = self.mysql.cursor()
- cursor.execute('INSERT INTO log (`type`, `time`, `room`, `nick`, `text`) VALUES ("topic", NOW(), %s, %s, %s)', (room, nick, text))
+ cursor = self.pgsql.cursor()
+ cursor.execute('INSERT INTO log ("type", "time", "room", "nick", "text") VALUES (\'topic\', now(), %s, %s, %s)', (room, nick, text))
cursor.close()
+ self.pgsql.commit()
diff --git a/modules/pgsql.py b/modules/pgsql.py
new file mode 100644
index 0000000..24cec76
--- /dev/null
+++ b/modules/pgsql.py
@@ -0,0 +1,30 @@
+from . import ModuleBase
+from pyPgSQL import PgSQL
+
+class Module(ModuleBase):
+ def __init__(self, manager):
+ ModuleBase.__init__(self, manager)
+
+ self.conf = manager.config['pgsql']
+
+ self.db = False
+ self._connect()
+
+ def _connect(self):
+ if self.db:
+ try:
+ self.db.close()
+ except:
+ pass
+
+ self.db = PgSQL.connect(host = self.conf['host'], user = self.conf['user'], password = self.conf['passwd'], database = self.conf['db'], client_encoding = 'utf8', unicode_results = 1)
+
+ def cursor(self):
+ try:
+ return self.db.cursor()
+ except PgSQL.OperationalError:
+ self._connect()
+ return self.db.cursor()
+
+ def commit(self):
+ self.db.commit()