Merge lp:~thomir-deactivatedaccount/core-image-watcher/trunk-use-uservice-utils into lp:core-image-watcher

[Thomi Richards]

Use uservice-utils.

Use uservice-utils.

[Joe Talbott (joetalbott)]

review: Approve

=== modified file 'core_image_watcher/__init__.py'
--- core_image_watcher/__init__.py	2015-03-31 16:23:22 +0000
+++ core_image_watcher/__init__.py	2015-04-01 21:27:37 +0000
@@ -20,14 +20,12 @@
 import argparse
 import configparser
 import logging
-import logging.handlers
 import os
 import subprocess
 import time
 
 import kombu
-import logstash
-
+from uservice_utils.logging import configure_service_logging
 
 from core_image_watcher import constants
 
@@ -134,45 +132,6 @@
     return body
 
 
-def configure_logging(config):
-    root_logger = logging.getLogger()
-    root_logger.setLevel(logging.INFO)
-
-    requests_logger = logging.getLogger('requests')
-    requests_logger.setLevel(logging.WARNING)
-
-    # If there is no ./logs directory, fallback to stderr.
-    log_path = os.path.abspath(
-        os.path.join(__file__, '../../logs/core-image-watcher.log'))
-    log_dir = os.path.dirname(log_path)
-    if os.path.exists(log_dir):
-        handler = logging.handlers.TimedRotatingFileHandler(
-            log_path,
-            when='D',
-            interval=1
-        )
-    else:
-        print("'logs' directory '{}' does not exist, using stderr "
-              "for app log.".format(log_dir))
-        handler = logging.StreamHandler()
-
-    handler.setFormatter(
-        logging.Formatter(
-            '%(asctime)s  %(name)s %(levelname)s: %(message)s'
-        )
-    )
-    root_logger.addHandler(handler)
-
-    if 'logstash' in config:
-        root_logger.addHandler(
-            logstash.LogstashHandler(
-                config['logstash']['host'],
-                int(config['logstash']['port']),
-                int(config['logstash']['version'])
-            )
-        )
-
-
 def main():
     parser = argparse.ArgumentParser(
         description='Core image watcher ...')
@@ -184,7 +143,12 @@
     config = configparser.ConfigParser()
     config.read(args.conf)
 
-    configure_logging(config)
+    log_path = os.path.abspath(
+        os.path.join(__file__, '../../logs/core-image-watcher.log'))
+    configure_service_logging(
+        log_path,
+        config['logstash'] if 'logstash' in config else None
+    )
 
     amqp_uris = config.get('amqp', 'uris').split()
     location = config.get('image', 'location')

=== modified file 'requirements.txt'
--- requirements.txt	2015-03-27 13:51:39 +0000
+++ requirements.txt	2015-04-01 21:27:37 +0000
@@ -1,2 +1,3 @@
 kombu==3.0.24
 python-logstash==0.4.2
+uservice_utils==1.0.0