Merge lp:~joetalbott/adt-cloud-service/add_log_rotation into lp:adt-cloud-service

[Joe Talbott]

Add log rotation.

Add log rotation.

[lp:~joetalbott/adt-cloud-service/add_log_rotation]

23. By Joe Talbott on 2015-04-14

Fix flake8 issues.

24. By Joe Talbott on 2015-04-14

Fix flake8 issues.

25. By Joe Talbott on 2015-04-14

Add flake8 to called-by-tarmac.py

[Celso Providelo (cprov)]

Lots of mixed changes, but looks good ...

review: Approve

=== modified file 'adt_cloud_service/__init__.py'
--- adt_cloud_service/__init__.py	2015-03-19 21:53:51 +0000
+++ adt_cloud_service/__init__.py	2015-04-14 22:25:59 +0000
@@ -53,22 +53,21 @@
         lambda: 'Adt-Cloud-Service - Copyright (C) 2015 Canonical\n'
     )
 
-
     @app.errorhandler(errors.MissingRequestParameters)
-    def handle_invalid_usage(error):
+    def handle_missing_request_parameter(error):
         response = flask.jsonify(error.to_dict())
         response.status_code = error.status
         return response
 
     @app.errorhandler(errors.ImageMapperError)
-    def handle_invalid_usage(error):
+    def handle_image_mapper_error(error):
         response = flask.jsonify(error.to_dict())
         response.status_code = error.status
         return response
 
     app.extensions['rabbit'] = queue.RabbitQueuer(config)
-    app.extensions['image-mapper'] = image.ImageMapperProxy(config
-        ['image_mapper']['url']
+    app.extensions['image-mapper'] = image.ImageMapperProxy(
+        config['image_mapper']['url']
     )
     app.config['SWIFT_URL'] = config['swift']['public_url']
     app.config['PROPAGATE_EXCEPTIONS'] = True
@@ -83,9 +82,14 @@
     log_dir = os.path.dirname(log_path)
     handler = None
     if os.path.exists(log_dir):
-        handler = logging.FileHandler(log_path)
+        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))
+        print("'logs' directory '{}' does not exist, "
+              "using stderr for app log.".format(log_dir))
         handler = logging.StreamHandler()
     handler.setFormatter(
         logging.Formatter(

=== modified file 'adt_cloud_service/errors.py'
--- adt_cloud_service/errors.py	2015-03-16 03:30:35 +0000
+++ adt_cloud_service/errors.py	2015-04-14 22:25:59 +0000
@@ -29,8 +29,8 @@
 
     def to_dict(self):
         return {
-            "message": "The following required parameters are missing: '%s'" \
-                % ', '.join(self.missing_parameter_names),
+            "message": "The following required parameters are missing: '%s'"
+                       % ', '.join(self.missing_parameter_names),
             "additional_message": self.additional_message
         }
 

=== modified file 'adt_cloud_service/image.py'
--- adt_cloud_service/image.py	2015-03-18 20:10:04 +0000
+++ adt_cloud_service/image.py	2015-04-14 22:25:59 +0000
@@ -33,7 +33,8 @@
         self._image_mapper_url = image_mapper_remote_address
 
     def get_image_name_for_series_and_architectiure(self, series, arch):
-        """Attempt to get a nova image name for a given series and architecture.
+        """Attempt to get a nova image name for a given series and
+        architecture.
 
         Internally this attempts to talk to the adt-image-mapper service, and
         returns whatever that service tells us to use.
@@ -44,7 +45,8 @@
         )
         path = '/v1/image'
         query = urllib.parse.urlencode(dict(series=series, architecture=arch))
-        url = urllib.parse.urlunparse((scheme, netloc, path, params, query, frag))
+        url = urllib.parse.urlunparse((scheme, netloc, path, params, query,
+                                       frag))
         try:
             with urllib.request.urlopen(url, timeout=10) as f:
                 return process_image_mapper_result(f.status, f.read())
@@ -58,7 +60,6 @@
             )
 
 
-
 def process_image_mapper_result(status, probably_json):
     """Process the reply from the image-mapper.
 
@@ -72,8 +73,10 @@
         data = json.loads(probably_json.decode())
     except UnicodeDecodeError as e:
         raise ImageMapperError(
-            "Unable to decode image-mapper response to unicode: {}".format(str(e)),
-            "Data from image-mapper is: {}".format(probably_json.decode('unicode_escape'))
+            "Unable to decode image-mapper response to unicode: {}".format(
+                str(e)),
+            "Data from image-mapper is: {}".format(
+                probably_json.decode('unicode_escape'))
         )
     except Exception as e:
         raise ImageMapperError(
@@ -83,5 +86,5 @@
     if status == 200:
         return data['image_name']
     else:
-        raise ImageMapperError("Error from image-mapper service: {}".format(data['message']))
-
+        raise ImageMapperError(
+            "Error from image-mapper service: {}".format(data['message']))

=== modified file 'adt_cloud_service/tests/test_functional.py'
--- adt_cloud_service/tests/test_functional.py	2015-03-18 20:20:47 +0000
+++ adt_cloud_service/tests/test_functional.py	2015-04-14 22:25:59 +0000
@@ -23,7 +23,6 @@
 import kombu
 import testtools
 from testtools.matchers import (
-    Contains,
     Equals,
     HasLength,
     raises,
@@ -76,7 +75,9 @@
         return instance
 
     def set_image_mapper_double(self):
-        instance = self.server_app.extensions['image-mapper'] = ImageMapperProxyDouble()
+        instance = ImageMapperProxyDouble()
+        self.server_app.extensions['image-mapper'] = instance
+
         return instance
 
     def assertEndpointDisallowsMethods(self, endpoint, methods):
@@ -123,7 +124,7 @@
         self.set_image_mapper_double()
         resp = self.client.post(
             '/v1/test',
-            data = {
+            data={
                 'package-name': 'librepng',
                 'architecture': 'i386',
                 'platform': 'nova',
@@ -165,7 +166,8 @@
 
 class ImageMapperProxyDouble(object):
 
-    """A test double for the image mapper proxy. Simply returns a simple string."""
+    """A test double for the image mapper proxy. Simply returns a simple
+    string."""
 
     def get_image_name_for_series_and_architectiure(self, series, arch):
         return "some-nova-image"
@@ -179,8 +181,8 @@
     unit tests.
 
     What we can do, which is a reasonable half-measure is to configure the
-    queuer class with an in-memory transport, and attempt to rigerously test the
-    interface between the queuer and it's caller.
+    queuer class with an in-memory transport, and attempt to rigerously test
+    the interface between the queuer and it's caller.
 
     """
     def test_queueing_does_not_alter_payload(self):
@@ -193,7 +195,7 @@
             'series': 'trusty',
         }
         copy_payload = test_payload.copy()
-        request_id = q.queue_test(copy_payload)
+        q.queue_test(copy_payload)
         self.assertEqual(test_payload, copy_payload)
 
     def test_attempt_queue_test(self):
@@ -218,7 +220,6 @@
         self.assertEqual(test_payload, message.payload)
 
 
-
 class ImageMapperFunctionalTests(testtools.TestCase):
 
     """Tests for the utility functions in the image module"""

=== modified file 'adt_cloud_service/v1.py'
--- adt_cloud_service/v1.py	2015-03-19 21:53:51 +0000
+++ adt_cloud_service/v1.py	2015-04-14 22:25:59 +0000
@@ -20,7 +20,7 @@
 import logging
 import urllib.parse
 
-from flask import current_app, request, url_for, jsonify
+from flask import current_app, request, jsonify
 
 from adt_cloud_service.errors import MissingRequestParameters
 
@@ -36,7 +36,8 @@
     }
     missing = required_keys.difference(set(request.form.keys()))
     if missing:
-        logger.error("Got request %r with missing keys %r", dict(request.form), missing)
+        logger.error("Got request %r with missing keys %r",
+                     dict(request.form), missing)
         raise MissingRequestParameters(missing)
 
     rabbit_request = dict()

=== modified file 'called-by-tarmac.py'
--- called-by-tarmac.py	2015-03-17 13:49:18 +0000
+++ called-by-tarmac.py	2015-04-14 22:25:59 +0000
@@ -89,6 +89,11 @@
                 'setup.py',
                 'test',
             ],
+            [
+                os.path.join(ve_dir, 'bin', 'python3'),
+                'setup.py',
+                'flake8',
+            ],
         )
         for cmd in all_cmds:
             ret = _run_command(cmd)

=== modified file 'setup.py'
--- setup.py	2015-03-13 02:19:05 +0000
+++ setup.py	2015-04-14 22:25:59 +0000
@@ -21,7 +21,7 @@
 import sys
 assert sys.version_info >= (3,), 'Python 3 is required'
 
-from setuptools import find_packages, setup, Extension
+from setuptools import find_packages, setup
 
 
 VERSION = '1.0.0'
@@ -30,7 +30,8 @@
 setup(
     name='adt-cloud-service',
     version=VERSION,
-    description='A microservice that queues test runs via a RESTful interface.',
+    description='A microservice that queues test runs '
+                'via a RESTful interface.',
     author='Canonical CI Engineering Team',
     author_email='[e-mail]',
     url='https://launchpad.net/adt-cloud-service',

=== modified file 'test_requirements.txt'
--- test_requirements.txt	2015-03-09 03:29:34 +0000
+++ test_requirements.txt	2015-04-14 22:25:59 +0000
@@ -1,1 +1,2 @@
-testtools==1.5.0
\ No newline at end of file
+testtools==1.5.0
+flake8==2.4.0