[rhmessaging-commits] rhmessaging commits: r2834 - mgmt/trunk/mint/python/mint.

[rhmessaging-commits at lists.jboss.org]

Author: nunofsantos
Date: 2008-11-18 15:26:38 -0500 (Tue, 18 Nov 2008)
New Revision: 2834

Modified:
   mgmt/trunk/mint/python/mint/update.py
Log:
expand one remaining 'finally' clause

Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py	2008-11-18 20:10:24 UTC (rev 2833)
+++ mgmt/trunk/mint/python/mint/update.py	2008-11-18 20:26:38 UTC (rev 2834)
@@ -157,9 +157,9 @@
       attrs["qmfClassKey"] = "%s, %s, %s" % (pkg, origCls, hash)
       attrs["managedBroker"] = str(self.broker.getBrokerId())
 
-      conn = model.dbConn.getConnection()
       try:
         try:
+          conn = model.dbConn.getConnection()
           cursor = conn.cursor()
           sql = model.generateSQLUpdate(sqlCls, attrs, id)
           #log.debug("SQL: %s", sql)
@@ -198,7 +198,7 @@
                 rec = cursor.fetchone()
                 dbObjId = rec[0]  
 
-                cursor = conn.cursor()
+                ###cursor = conn.cursor()
                 sql = model.generateSQLUpdateWhere("broker_registration", {"broker_id": dbObjId}, \
                                                        {"url": self.broker.getFullUrl()})
                 #log.debug("SQL: %s", sql)
@@ -243,35 +243,34 @@
       attrs["recTime"] = time_unwarp(datetime.fromtimestamp(timestamps[0]/1000000000))
 
       try:
-        conn = model.dbConn.getConnection()
-        cursor = conn.cursor()
-        subSql = model.generateSQLSelect(sqlCls, id)
-        sql = model.generateSQLInsert(sqlStatsCls, attrs, {sqlCls + "_id": subSql})
-        #log.debug("SQL: %s", sql)
-        cursor.execute(sql)
+        try:
+          conn = model.dbConn.getConnection()
+          cursor = conn.cursor()
+          subSql = model.generateSQLSelect(sqlCls, id)
+          sql = model.generateSQLInsert(sqlStatsCls, attrs, {sqlCls + "_id": subSql})
+          #log.debug("SQL: %s", sql)
+          cursor.execute(sql)
 
-        sql = "select currval('%s_id_seq')" % (sqlStatsCls)
-        #log.debug("SQL: %s", sql)
-        cursor.execute(sql)
-        rec = cursor.fetchone()
-        dbStatsId = rec[0]  
-        log.debug("%s(%s) created", statsCls, id)
+          sql = "select currval('%s_id_seq')" % (sqlStatsCls)
+          #log.debug("SQL: %s", sql)
+          cursor.execute(sql)
+          rec = cursor.fetchone()
+          dbStatsId = rec[0]  
+          log.debug("%s(%s) created", statsCls, id)
 
-        sql = model.generateSQLUpdate(sqlCls, {"stats_curr_id": dbStatsId}, id, updateStats=True)
-        #log.debug("SQL: %s", sql)
-        cursor.execute(sql)
-        conn.commit()
-      except Exception, e:
-        conn.rollback()
-        print e
-        print_exc()
+          sql = model.generateSQLUpdate(sqlCls, {"stats_curr_id": dbStatsId}, id, updateStats=True)
+          #log.debug("SQL: %s", sql)
+          cursor.execute(sql)
+          conn.commit()
+        except Exception, e:
+          conn.rollback()
+          print e
+          print_exc()
       finally:
         conn.close()
-
     except:
       print_exc()
 
-
 class MethodUpdate(ModelUpdate):
   def __init__(self, broker, seq, response):
     ModelUpdate.__init__(self, broker, response)