Author: asterix Date: 2006-07-31 09:45:29 +0200 (Mon, 31 Jul 2006) New Revision: 6624

Modified: trunk/src/common/logger.py trunk/src/common/optparser.py Log: re-connect to DB after upgrades (upgrade can modify DB structure)

Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2006-07-30 20:06:42 UTC (rev 6623) +++ trunk/src/common/logger.py 2006-07-31 07:45:29 UTC (rev 6624) @@ -99,25 +99,29 @@ class Logger: def __init__(self): self.jids_already_in = [] # holds jids that we already have in DB - + self.con = None + if not os.path.exists(LOG_DB_PATH): # this can happen only the first time (the time we create the db) # db is not created here but in src/common/checks_paths.py return self.init_vars() - + def init_vars(self): # if locked, wait up to 20 sec to unlock # before raise (hopefully should be enough) + if self.con: + self.con.close() self.con = sqlite.connect(LOG_DB_PATH, timeout = 20.0, isolation_level = 'IMMEDIATE') self.cur = self.con.cursor() - + self.get_jids_already_in_db()

def get_jids_already_in_db(self): self.cur.execute('SELECT jid FROM jids') rows = self.cur.fetchall() # list of tupples: [(u'aaa@bbb',), (u'cc@dd',)] + self.jids_already_in = [] for row in rows: # row[0] is first item of row (the only result here, the jid) self.jids_already_in.append(row[0])

Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2006-07-30 20:06:42 UTC (rev 6623) +++ trunk/src/common/optparser.py 2006-07-31 07:45:29 UTC (rev 6624) @@ -147,6 +147,7 @@ if old < [0, 10, 1, 3] and new >= [0, 10, 1, 3]: self.update_config_to_01013() + gajim.logger.init_vars() gajim.config.set('version', new_version) def update_config_x_to_09(self):