Cleanup database initialisation code

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/pbs.conf.sample b/pbs.conf.sample
index 6578f86e70e717901e13afc4adcde3de0f6aab7d..57404e64a4f845fdb7674671300a109895a99af2 100644 (file)
--- a/pbs.conf.sample
+++ b/pbs.conf.sample
@@ -1,7 +1,7 @@
 [database]
-; Credentials to the pakfire build service database.
+; Credentials to the pakfire build service database
 
-host  = mysql-master.ipfire.org
-user  = pakfire
-pass  = pakfire
-db    = pakfire
+name      = pakfire
+hostname  = db-master.ipfire.org
+user      = pakfire
+password  = pakfire

diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py
index 365c6128c210f7e1b3a334336ec3de819ef31344..424bdb2fb5e3e9cb3cef3b44227ca22b11dc61ae 100644 (file)
--- a/src/buildservice/__init__.py
+++ b/src/buildservice/__init__.py
@@ -89,21 +89,14 @@ class Backend(object):
 
        @lazy_property
        def db(self):
-               return self.connect_database()
+               name     = self.config.get("database", "name")
+               hostname = self.config.get("database", "hostname")
+               user     = self.config.get("database", "user")
+               password = self.config.get("database", "password")
 
-       def connect_database(self, section="database"):
-               name = self.config.get(section, "db")
-               host = self.config.get(section, "host")
-               user = self.config.get(section, "user")
+               log.debug("Connecting to database %s @ %s" % (name, hostname))
 
-               if self.config.has_option(section, "pass"):
-                       pw = self.config.get(section, "pass")
-               else:
-                       pw = None
-
-               log.debug("Connecting to database %s @ %s" % (name, host))
-
-               return database.Connection(host, name, user=user, password=pw)
+               return database.Connection(hostname, name, user=user, password=password)
 
        def cleanup_files(self):
                query = self.db.query("SELECT * FROM queue_delete")