archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Simplified files_make_public_t management command.

Browse Source 
'except Exception: pass' is always bad.
This commit is contained in:
Sybren A. Stüvel 2016-05-10 18:18:09 +02:00
parent 0f0712205c
commit fe074715e1
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pillar/manage.py
View File

@ -687,26 +687,27 @@ def files_make_public_t():
from gcloud.exceptions import InternalServerError from gcloud.exceptions import InternalServerError
from application.utils.gcs import GoogleCloudStorageBucket from application.utils.gcs import GoogleCloudStorageBucket
files_collection = app.data.driver.db['files'] files_collection = app.data.driver.db['files']
for f in files_collection.find({'backend': 'gcs'}): for f in files_collection.find({'backend': 'gcs'}):
if 'variations' in f: if 'variations' not in f:
variation_t = next((item for item in f['variations'] \ continue
variation_t = next((item for item in f['variations']
if item['size'] == 't'), None) if item['size'] == 't'), None)
if variation_t: if not variation_t:
continue
try: try:
storage = GoogleCloudStorageBucket(str(f['project'])) storage = GoogleCloudStorageBucket(str(f['project']))
blob = storage.Get(variation_t['file_path'], to_dict=False) blob = storage.Get(variation_t['file_path'], to_dict=False)
if blob: if not blob:
try: print('Unable to find blob for project %s file %s', f['project'], f['_id'])
print("Making blob public: {0}".format(blob.path)) continue
print('Making blob public: {0}'.format(blob.path))
blob.make_public() blob.make_public()
except InternalServerError: except InternalServerError as ex:
print("Internal Server Error") print('Internal Server Error: ', ex)
except Exception:
pass
except InternalServerError:
print("Internal Server Error")
except Exception:
pass
@manager.command @manager.command