[rhmessaging-commits] rhmessaging commits: r3956 - in mgmt/newdata/cumin: python/cumin and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2010-05-10 15:09:10 -0400 (Mon, 10 May 2010)
New Revision: 3956

Modified:
   mgmt/newdata/cumin/etc/cumin.conf
   mgmt/newdata/cumin/python/cumin/config.py
Log:
Spruce up the config file; add the system config file to the config search path

Modified: mgmt/newdata/cumin/etc/cumin.conf
===================================================================
--- mgmt/newdata/cumin/etc/cumin.conf	2010-05-10 18:11:41 UTC (rev 3955)
+++ mgmt/newdata/cumin/etc/cumin.conf	2010-05-10 19:09:10 UTC (rev 3956)
@@ -1,2 +1,17 @@
-[main]
-data: postgresql://cumin@localhost/cumin
+# Fields in comments reflect the default values
+
+[common]
+# database: dbname=cumin user=cumin host=localhost
+# broker: localhost:5672
+# debug: False
+log-file: /var/log/cumin/cumin.log
+log-level: info
+
+[web]
+# host: localhost
+# port: 45672
+# operator-email: [none]
+
+[data]
+# expire-frequency: 600
+# expire-threshold: 86400

Modified: mgmt/newdata/cumin/python/cumin/config.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/config.py	2010-05-10 18:11:41 UTC (rev 3955)
+++ mgmt/newdata/cumin/python/cumin/config.py	2010-05-10 19:09:10 UTC (rev 3956)
@@ -39,6 +39,8 @@
 
     def parse(self):
         paths = list()
+
+        paths.append(os.path.join("", "etc", "cumin.conf"))
         paths.append(os.path.join(self.home, "etc", "cumin.conf"))
         paths.append(os.path.join(os.path.expanduser("~"), ".cumin.conf"))