From: Torsten Werner <twerner@debian.org>
Date: Wed, 23 Mar 2011 21:53:29 +0000 (+0100)
Subject: Merge branch 'master' of ftp-master.debian.org:/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c757aaa7d63b4508ad353a2339507ed837a8e0a3;hp=347c09103eb5aae32976f03e9a9a0e8d8b4afb86;p=dak.git

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 16745748..d97c52ba 100644
--- 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 424359a3..77d00976 100755
--- 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()])