X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fupdate_db.py;h=b757912177e0dfa8c0baf2c9b5f4ddc61c07f557;hb=27e00376e81d1c37ff327ee0d39670b266418869;hp=71bac95514980ab67ca814e30f543052e9a9b66a;hpb=62a46fad36e7f656052e19dce6b3cf5a1552c1b2;p=dak.git

diff --git a/dak/update_db.py b/dak/update_db.py
index 71bac955..b7579121 100755
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -41,11 +41,12 @@ import errno
 from daklib import utils
 from daklib.config import Config
 from daklib.dak_exceptions import DBUpdateError
+from daklib.daklog import Logger
 
 ################################################################################
 
 Cnf = None
-required_database_schema = 43
+required_database_schema = 66
 
 ################################################################################
 
@@ -100,26 +101,45 @@ Updates dak's database schema to the lastest version. You should disable crontab
             print "No configuration table found, assuming dak database revision to be pre-zero"
             return -1
 
+################################################################################
+
+    def get_transaction_id(self):
+        '''
+        Returns the current transaction id as a string.
+        '''
+        cursor = self.db.cursor()
+        cursor.execute("SELECT txid_current();")
+        id = cursor.fetchone()[0]
+        cursor.close()
+        return id
+
 ################################################################################
 
     def update_db(self):
         # Ok, try and find the configuration table
         print "Determining dak database revision ..."
         cnf = Config()
+        logger = Logger('update-db')
 
         try:
             # Build a connect string
-            connect_str = "dbname=%s"% (cnf["DB::Name"])
-            if cnf["DB::Host"] != '': connect_str += " host=%s" % (cnf["DB::Host"])
-            if cnf["DB::Port"] != '-1': connect_str += " port=%d" % (int(cnf["DB::Port"]))
+            if cnf.has_key("DB::Service"):
+                connect_str = "service=%s" % cnf["DB::Service"]
+            else:
+                connect_str = "dbname=%s"% (cnf["DB::Name"])
+                if cnf.has_key("DB::Host") and cnf["DB::Host"] != '':
+                    connect_str += " host=%s" % (cnf["DB::Host"])
+                if cnf.has_key("DB::Port") and cnf["DB::Port"] != '-1':
+                    connect_str += " port=%d" % (int(cnf["DB::Port"]))
 
             self.db = psycopg2.connect(connect_str)
 
-        except:
-            print "FATAL: Failed connect to database"
-            pass
+        except Exception as e:
+            print "FATAL: Failed connect to database (%s)" % str(e)
+            sys.exit(1)
 
         database_revision = int(self.get_db_rev())
+        logger.log(['transaction id before update: %s' % self.get_transaction_id()])
 
         if database_revision == -1:
             print "dak database schema predates update-db."
@@ -140,20 +160,26 @@ Updates dak's database schema to the lastest version. You should disable crontab
 
         if database_revision == required_database_schema:
             print "no updates required"
+            logger.log(["no updates required"])
             sys.exit(0)
 
         for i in range (database_revision, required_database_schema):
-            print "updating database schema from %d to %d" % (database_revision, i+1)
             try:
                 dakdb = __import__("dakdb", globals(), locals(), ['update'+str(i+1)])
                 update_module = getattr(dakdb, "update"+str(i+1))
                 update_module.do_update(self)
-            except DBUpdateError, e:
+                message = "updated database schema from %d to %d" % (database_revision, i+1)
+                print message
+                logger.log([message])
+            except DBUpdateError as e:
                 # Seems the update did not work.
                 print "Was unable to update database schema from %d to %d." % (database_revision, i+1)
                 print "The error message received was %s" % (e)
+                logger.log(["DB Schema upgrade failed"])
+                logger.close()
                 utils.fubar("DB Schema upgrade failed")
             database_revision += 1
+        logger.close()
 
 ################################################################################
 
@@ -174,9 +200,12 @@ Updates dak's database schema to the lastest version. You should disable crontab
             self.usage(exit_code=1)
 
         try:
-            lock_fd = os.open(cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT)
-            fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-        except IOError, e:
+            if os.path.isdir(cnf["Dir::Lock"]):
+                lock_fd = os.open(os.path.join(cnf["Dir::Lock"], 'dinstall.lock'), os.O_RDWR | os.O_CREAT)
+                fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
+            else:
+                utils.warn("Lock directory doesn't exist yet - not locking")
+        except IOError as e:
             if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EAGAIN':
                 utils.fubar("Couldn't obtain lock; assuming another 'dak process-unchecked' is already running.")