Author: nunofsantos Date: 2008-12-11 17:54:19 -0500 (Thu, 11 Dec 2008) New Revision: 2988 Modified: mgmt/trunk/mint/python/mint/update.py Log: remove extraneous commit/rollback from DBExpireUpdate Modified: mgmt/trunk/mint/python/mint/update.py =================================================================== --- mgmt/trunk/mint/python/mint/update.py 2008-12-11 22:16:42 UTC (rev 2987) +++ mgmt/trunk/mint/python/mint/update.py 2008-12-11 22:54:19 UTC (rev 2988) @@ -336,6 +336,19 @@ finally: self.model.unlock() +class DBExpireUpdate(ModelUpdate): + def __init__(self, model): + super(DBExpireUpdate, self).__init__(model, None, None) + + def process(self, conn): + cursor = conn.cursor() + rowcount = 0 + attrs = self.model.dbExpireThread.attrs + for op in self.model.dbExpireThread.ops: + rowcount += op.execute(cursor, attrs) + log.debug("%d records expired" % (rowcount)) + + class UpdateQueue(ConcurrentQueue): def __init__(self, maxsize=0, slotCount=1): self.slotCount = slotCount @@ -375,20 +388,3 @@ if len(self.slots[slot]) > 0: return self.slots[slot].popleft() return None - -class DBExpireUpdate(ModelUpdate): - def __init__(self, model): - super(DBExpireUpdate, self).__init__(model, None, None) - - def process(self, conn): - try: - cursor = conn.cursor() - rowcount = 0 - attrs = self.model.dbExpireThread.attrs - for op in self.model.dbExpireThread.ops: - rowcount += op.execute(cursor, attrs) - log.debug("%d records expired" % (rowcount)) - conn.commit() - except: - conn.rollback() - log.exception("DB cleanup failed")