Merge lp:~thomir-deactivatedaccount/uservice-utils/trunk-fix-bugfix into lp:uservice-utils

[Thomi Richards]

Fix a bug in the logstash config reading code.

Fix a bug in the logstash config reading code.

[Celso Providelo (cprov)]

Right, callsites provide the config section as argument (config['logstash']), not the full configparser nested dictionary.

Thanks for fixing this.

review: Approve

=== modified file 'CHANGELOG'
--- CHANGELOG	2015-04-02 02:43:04 +0000
+++ CHANGELOG	2015-04-02 03:43:12 +0000
@@ -7,6 +7,9 @@
 * Added `uservice_utils.logging.ExtraLogging` class to help manage passing
  'extra' arguments to multiple logging calls.
 
+* Fixed a bug where the logstash config was not read correctly from the passed
+  in dictionary.
+
 1.0.0
 =====
 

=== modified file 'uservice_utils/logging.py'
--- uservice_utils/logging.py	2015-04-02 03:02:58 +0000
+++ uservice_utils/logging.py	2015-04-02 03:43:12 +0000
@@ -71,12 +71,12 @@
     )
     root_logger.addHandler(handler)
 
-    if logstash_config and 'logstash' in logstash_config:
+    if logstash_config:
         root_logger.addHandler(
             logstash.LogstashHandler(
-                config['logstash']['host'],
-                int(config['logstash']['port']),
-                int(config['logstash']['version'])
+                logstash_config['host'],
+                int(logstash_config['port']),
+                int(logstash_config['version'])
             )
         )