Merge lp:~thomir-deactivatedaccount/adt-cloud-service/trunk-fix-socket-timeout into lp:adt-cloud-service

[Thomi Richards]

Deal with socket timeouts while communicating with the image-mapper service.

Catch socket timeouts while talking to the image-mapper service, and report a nice error to the caller.

[Joe Talbott (joetalbott)]

review: Approve

=== modified file 'adt_cloud_service/image.py'
--- adt_cloud_service/image.py	2015-03-16 23:43:12 +0000
+++ adt_cloud_service/image.py	2015-03-17 21:09:27 +0000
@@ -20,6 +20,7 @@
 import urllib.parse
 import urllib.request
 import json
+import socket
 
 from adt_cloud_service.errors import ImageMapperError
 
@@ -50,7 +51,7 @@
         except urllib.error.HTTPError as e:
             # Got an HTTP error from the image mapper:
             return process_image_mapper_result(e.code, e.file.read())
-        except urllib.error.URLError as e:
+        except (urllib.error.URLError, socket.timeout) as e:
             # Couldn't complete tcp handshake with image mapper:
             raise ImageMapperError(
                 "Unable to contact adt-image-mapper service: {}".format(str(e))