From: Magnus Hagander <magnus@hagander.net>
Date: Fri, 24 Oct 2008 15:20:43 +0000 (+0000)
Subject: Read database from a configfile, so beta can now easily have
X-Git-Url: http://git.postgresql.org/gitweb/static/session/%7B%7Bsession.id%7D%7D-%7B%7Bsession.title%7Cslugify%7D%7D?a=commitdiff_plain;h=ce807cdaa3f3e8cd1d600df9134c23ac7bd7c4cf;p=hamn.git

Read database from a configfile, so beta can now easily have
it's own database.
---

diff --git a/aggregator.py b/aggregator.py
index fcfcc26..ddfa155 100755
--- a/aggregator.py
+++ b/aggregator.py
@@ -11,6 +11,7 @@ import psycopg2
 import feedparser
 import datetime
 import socket
+import ConfigParser
 
 class Aggregator:
 	def __init__(self, db):
@@ -68,4 +69,6 @@ class Aggregator:
 		self.stored += 1
 
 if __name__=="__main__":
-	Aggregator(psycopg2.connect('dbname=planetpg host=/tmp/')).Update()
+	c = ConfigParser.ConfigParser()
+	c.read('planet.ini')
+	Aggregator(psycopg2.connect(c.get('planet','db'))).Update()
diff --git a/discovery.py b/discovery.py
index 3ec675d..5beeeb9 100755
--- a/discovery.py
+++ b/discovery.py
@@ -12,6 +12,7 @@ import psycopg2
 import feedparser
 import datetime
 import socket
+import ConfigParser
 
 class Aggregator:
 	def __init__(self, db):
@@ -44,4 +45,6 @@ class Aggregator:
 			print feed
 
 if __name__=="__main__":
-	Aggregator(psycopg2.connect('dbname=planetpg host=/tmp/')).Update()
+	c = ConfigParser.ConfigParser()
+	c.read('planet.ini')
+	Aggregator(psycopg2.connect(c.get('planet','db'))).Update()
diff --git a/generator.py b/generator.py
index 51b6728..d4d6e60 100755
--- a/generator.py
+++ b/generator.py
@@ -10,6 +10,7 @@ Copyright (C) 2008 PostgreSQL Global Development Group
 import psycopg2
 import psycopg2.extensions
 import PyRSS2Gen
+import ConfigParser 
 import datetime
 import sys
 import tidy
@@ -154,4 +155,6 @@ class HtmlTruncator(HTMLParser):
 			return self.fulltxt
 
 if __name__=="__main__":
-	Generator(psycopg2.connect('dbname=planetpg host=/tmp')).Generate()
+	c = ConfigParser.ConfigParser()
+	c.read('planet.ini')
+	Generator(psycopg2.connect(c.get('planet','db'))).Generate()