Skip to content
This repository was archived by the owner on Sep 12, 2018. It is now read-only.

Commit 21e8bde

Browse files
committed
Merge pull request #391 from dotcloud/cloudfront_fixes
Don't crash on Cloudfront IOError
2 parents 397297f + 034de2c commit 21e8bde

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

docker_registry/images.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,12 @@ def _get_image_layer(image_id, headers=None, bytes_range=None):
7878
# If store allows us to just redirect the client let's do that, we'll
7979
# offload a lot of expensive I/O and get faster I/O
8080
if cfg.storage_redirect:
81-
content_redirect_url = store.content_redirect_url(path)
82-
if content_redirect_url:
83-
return flask.redirect(content_redirect_url, 302)
81+
try:
82+
content_redirect_url = store.content_redirect_url(path)
83+
if content_redirect_url:
84+
return flask.redirect(content_redirect_url, 302)
85+
except IOError as e:
86+
logger.debug(str(e))
8487

8588
status = None
8689
layer_size = 0

0 commit comments

Comments
 (0)