Merge branch 'master' of ftp-master.debian.org:/srv/ftp.debian.org/git/dak

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 167457485350dfc4b23ffcb921cdbb947fc81db9..d97c52bacfe385fb1862ed9866efe5b01da9055a 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -243,9 +243,13 @@ Dir
 
 DB
 {
-  Name "backports";
-  Host "";
-  Port -1;
+  Service "backports";
+  // PoolSize should be at least ThreadCount + 1
+  PoolSize 5;
+  // MaxOverflow shouldn't exceed postgresql.conf's max_connections - PoolSize
+  MaxOverflow 13;
+  // should be false for encoding == SQL_ASCII
+  Unicode "false"
 };
 
 SuiteMappings

diff --git a/dak/update_db.py b/dak/update_db.py
index 424359a384c807b95247aa2f01f06828330aa24b..77d0097604743c40191da00bf970c11b8b0c90ec 100755 (executable)
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -123,7 +123,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
 
         try:
             # Build a connect string
-            if cnf["DB::Service"]:
+            if cnf.has_key("DB::Service"):
                 connect_str = "service=%s" % cnf["DB::Service"]
             else:
                 connect_str = "dbname=%s"% (cnf["DB::Name"])
@@ -134,7 +134,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
 
         except:
             print "FATAL: Failed connect to database"
-            pass
+            sys.exit(1)
 
         database_revision = int(self.get_db_rev())
         logger.log(['transaction id before update: %s' % self.get_transaction_id()])