Merge lp:~cprov/adt-cloud-worker/int-error into lp:adt-cloud-worker

[Celso Providelo]

Fix special 'exit_code' value to 100 (int not string) and also include traceback information in the message payload for helping later debug.

Fix special 'exit_code' value to 100 (int not string) and also include traceback information in the message payload for helping later debug.

[Thomi Richards (thomir-deactivatedaccount)]

LGTM - we need to be careful about where we publish tracebacks to, but in this case the rabbitmq messages are always private.

review: Approve

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-03-20 19:17:25 +0000
+++ adt_cloud_worker/__init__.py	2015-03-24 01:56:50 +0000
@@ -31,6 +31,7 @@
 import subprocess
 import tarfile
 import tempfile
+import traceback
 
 from adt_cloud_worker._cloud_support import (
     get_default_testbed_flavor,
@@ -118,17 +119,19 @@
                 container_name = 'adt-{}'.format(body['request_id'])
                 upload_tarball_to_swift_container(tarball_path, container_name)
         except Exception as e:
-            # Unexpected failures ...
-            body['exit_code'] = '100'
+            # 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.
+            body['exit_code'] = 100
+            body['worker_traceback'] = traceback.format_exc()
             logger.error(e, exc_info=True, extra=body)
         finally:
             logger.info('Posting results: %s', body, extra=body)
-            # TODO: send error logging to result-checker in the message.
             queue = self.connection.SimpleQueue(
                 'adt.results.{}'.format(API_VERSION))
             queue.put(body)
             queue.close()
-            if tarball_path and os.path.exists(tarball_path):
+            if tarball_path is not None and os.path.exists(tarball_path):
                 os.remove(tarball_path)
             message.ack()
             logger.info('Done!', extra=body)