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

[Joe Talbott]

Add extra service info to logging.

Add extra service info to logging.

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

24. By Joe Talbott on 2015-04-15

Move 'logging_extra' to the constants module.

25. By Joe Talbott on 2015-04-15

Fix extra data.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== added file 'adt_cloud_service/constants.py'
--- adt_cloud_service/constants.py	1970-01-01 00:00:00 +0000
+++ adt_cloud_service/constants.py	2015-04-15 17:21:13 +0000
@@ -0,0 +1,36 @@
+# adt-cloud-service
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import socket
+
+"""Constants for this service."""
+
+
+API_VERSION = "v1"
+
+SOLUTION_NAME = "proposed-migration"
+
+SERVICE_NAME = "adt-cloud-service"
+
+HOSTNAME = socket.gethostname()
+
+
+logging_extra = {
+    'solution': SOLUTION_NAME,
+    'service': SERVICE_NAME,
+    'hostname': HOSTNAME,
+}

=== modified file 'adt_cloud_service/queue.py'
--- adt_cloud_service/queue.py	2015-03-19 22:00:45 +0000
+++ adt_cloud_service/queue.py	2015-04-15 17:21:13 +0000
@@ -24,6 +24,8 @@
 import logging
 logger = logging.getLogger(__name__)
 
+from adt_cloud_service.constants import logging_extra
+
 
 class RabbitQueuer(object):
     """A class that can send things to the rabbit queue. An instance of this
@@ -62,6 +64,8 @@
         declare = [self.adt_exchange, queue]
 
         payload_copy['request_id'] = uuid()
+        extra = logging_extra.copy()
+        extra.update(payload_copy)
 
         with producers[self.connection].acquire(block=True) as producer:
 
@@ -70,8 +74,10 @@
                 # the exception should be registerred with flask, so we
                 # automatically return something nice and RESTful to the user
                 # see: adt_cloud_service.errors.
-                logger.error('Error: %r', exc, exc_info=1)
-                logger.info('Retry in %s seconds.', interval)
+                logger.error('Error: %r', exc, exc_info=1,
+                             extra=extra)
+                logger.info('Retry in %s seconds.', interval,
+                            extra=extra)
 
             publish = self.connection.ensure(
                 producer, producer.publish,
@@ -81,5 +87,5 @@
                 exchange=self.adt_exchange,
                 routing_key=routing_key,
                 declare=declare)
-        logger.info("Submitted payload %r", payload_copy, extra=payload_copy)
+        logger.info("Submitted payload %r", payload_copy, extra=extra)
         return payload_copy['request_id']

=== modified file 'adt_cloud_service/v1.py'
--- adt_cloud_service/v1.py	2015-04-14 22:23:27 +0000
+++ adt_cloud_service/v1.py	2015-04-15 17:21:13 +0000
@@ -24,6 +24,8 @@
 
 from adt_cloud_service.errors import MissingRequestParameters
 
+from adt_cloud_service.constants import logging_extra
+
 logger = logging.getLogger(__name__)
 
 
@@ -37,7 +39,8 @@
     missing = required_keys.difference(set(request.form.keys()))
     if missing:
         logger.error("Got request %r with missing keys %r",
-                     dict(request.form), missing)
+                     dict(request.form), missing,
+                     extra=logging_extra)
         raise MissingRequestParameters(missing)
 
     rabbit_request = dict()