Merge pull request #1851 from coreos-inc/swift-404

Don't exception log for expected 404s in Swift storage
2016-09-22 16:56:12 -04:00 · 2016-09-22 16:56:12 -04:00 · 2f4dfa0d06
commit 2f4dfa0d06
parent 1a1a5f7240 4f0ddc8d6e
1 changed files with 5 additions and 0 deletions
--- a/storage/swift.py
+++ b/storage/swift.py
@ -120,6 +120,11 @@ class SwiftStorage(BaseStorage):
    path = self._normalize_path(path)
    try:
      return self._get_connection().head_object(self._swift_container, path)
+    except ClientException as ce:
+      if ce.http_status != 404:
+        logger.exception('Could not head object at path %s: %s', path, ex)
+
+      return None
    except Exception as ex:
      logger.exception('Could not head object at path %s: %s', path, ex)
      return None