Add a debug configuration option.

powa-collector.conf-dist

@@ -1,5 +1,6 @@
 {
     "repository": {
         "dsn": "postgresql://powa_user@localhost:5432/powa"
-    }
+    },
+    "debug": false
 }

powa-collector.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 
 from powa_collector import PowaCollector
-import logging
 
-# app = PowaCollector()
-app = PowaCollector(loglevel=logging.DEBUG)
+app = PowaCollector()
 app.main()

powa_collector/__init__.py

@@ -42,11 +42,16 @@
 
 
 class PowaCollector():
-    def __init__(self, loglevel=logging.INFO):
+    def __init__(self):
         self.workers = {}
         self.logger = logging.getLogger("powa-collector")
         self.stopping = False
 
+        raw_options = parse_options()
+        loglevel = logging.INFO
+        if (raw_options["debug"]):
+            loglevel = logging.DEBUG
+
         extra = {'threadname': '-'}
         logging.basicConfig(
                 format='%(asctime)s %(threadname)s %(levelname)-6s: %(message)s ',

powa_collector/options.py

@@ -1,11 +1,23 @@
+"""
+Simple configuration file handling, as a JSON.
+"""
 import json
 
 
 def get_full_config(conn):
+    """
+    Return the full configuration, consisting of the information from the local
+    configuration file and the remote servers stored on the repository
+    database.
+    """
     return add_servers_config(conn, parse_options())
 
 
 def add_servers_config(conn, config):
+    """
+    Add the remote servers stored on the repository database to a given
+    configuration JSON.
+    """
     if ("servers" not in config):
         config["servers"] = {}
 
@@ -39,8 +51,19 @@ def add_servers_config(conn, config):
 
 
 def parse_options():
-    return parse_file('./powa-collector.conf')
+    """
+    Parse the local configuration file and return the resulting JSON, also
+    adding the implicit values if needed.
+    """
+    options = parse_file('./powa-collector.conf')
+    if ('debug' not in options):
+        options["debug"] = False
+
+    return options
 
 
 def parse_file(filepath):
+    """
+    Read a configuration file and return the JSON
+    """
     return json.load(open(filepath))