Merge lp:~thomir-deactivatedaccount/core-image-publisher/fix-logger into lp:core-image-publisher

[Thomi Richards]

Some fixes for logging.

Some fixes for logging

[Celso Providelo (cprov)]

As discussed on IRC you verified that msg.reject() behaves exactly as msg.requeue() when there are no DLX configured for the queue, so the message goes back to the queue, which is the intended behaviour for now.

[]

review: Approve

=== modified file 'core_image_publisher/worker.py'
--- core_image_publisher/worker.py	2015-03-26 22:26:21 +0000
+++ core_image_publisher/worker.py	2015-03-27 04:47:47 +0000
@@ -17,8 +17,11 @@
 
 """Business logic or the service lives here."""
 
+import logging
 from core_image_publisher.queue import enqueue_message
 
+logger = logging.getLogger(__name__)
+
 
 def logging_worker(message):
     logger.info("Got %r", message.payload, extra=message.payload)
@@ -30,7 +33,7 @@
     except KeyError as e:
         logger.error(
             "Unable to deserialize message payload - rejecting message: %s",
-            s,
+            e,
             extra=payload
         )
         message.reject()
@@ -55,4 +58,3 @@
 
 def upload_image_to_glance(nova_image_path):
     """Upload the nova image to glance, returning the name of the image in glance."""
-