Merge lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-trap-kill into lp:adt-cloud-worker

[Thomi Richards]

Catch KeyboardInterrupt so we don't put malformed payloads on the message queue.

Catch KeyboardInterrupt so we don't put malformed payloads on the message queue.

[Joe Talbott (joetalbott)]

This looks okay assuming we're not doing any threading that might cause a different thread to catch the SIGINT and raise the exception in a different thread.

review: Approve

[Para Siva (psivaa)]

+1 bar just an inline comment.

review: Approve

[Ubuntu CI Bot (uci-bot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Evan (ev)]

review: Approve

[Francis Ginther (fginther)]

LGTM

review: Approve

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-04-15 19:15:32 +0000
+++ adt_cloud_worker/__init__.py	2015-04-17 14:51:27 +0000
@@ -89,6 +89,7 @@
         for later checking.
         """
         body['worker'] = self.worker_name
+        body['exit_code'] = 100
         extra = logging_extra.copy()
         extra.update(body)
         logger.info('Received message request: %s', body, extra=extra)
@@ -123,7 +124,7 @@
                 # by the adt-result-checker.
                 container_name = 'adt-{}'.format(body['request_id'])
                 upload_tarball_to_swift_container(tarball_path, container_name)
-        except Exception as e:
+        except BaseException as e:
             # Unexpected failures are tagged with special exit_code 100 and
             # carry the worker_traceback in the message payload. This will
             # help debugging of deadletter-ed messages.