valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check and report empty S3 bucket

Browse Source
This commit is contained in:
Aditya Kulkarni 2016-01-12 16:40:44 -05:00
parent 54b9641330
commit 9398c44945
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/fileserver/s3fs.py
View File

@ -435,8 +435,17 @@ def _refresh_buckets_cache_file(cache_file):
continue
except KeyError:
# no human readable error message provided
log.warning("'{0}' response for bucket '{1}'".format(meta_response['Code'], bucket_name))
continue
if 'Code' in meta_response:
log.warning(
("'{0}' response for "
"bucket '{1}'").format(meta_response['Code'],
bucket_name))
continue
else:
log.warning(
('S3 Error! Do you have any files '
'in your S3 bucket?'))
return {}
metadata[saltenv] = bucket_files