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

refresh_links_for_backend: skip files with non-existing projects.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-07-27 10:44:45 +02:00
parent 862fcbf147
commit a319720b8a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pillar/application/modules/file_storage.py
View File

@ -456,6 +456,7 @@ def refresh_links_for_backend(backend_name, chunk_size, expiry_seconds):
# Retrieve expired links. # Retrieve expired links.
files_collection = current_app.data.driver.db['files'] files_collection = current_app.data.driver.db['files']
proj_coll = current_app.data.driver.db['projects']
now = datetime.datetime.now(tz=bson.tz_util.utc) now = datetime.datetime.now(tz=bson.tz_util.utc)
expire_before = now + datetime.timedelta(seconds=expiry_seconds) expire_before = now + datetime.timedelta(seconds=expiry_seconds)
@ -471,11 +472,18 @@ def refresh_links_for_backend(backend_name, chunk_size, expiry_seconds):
log.info('No links to refresh.') log.info('No links to refresh.')
return return
refreshed = 0
for file_doc in to_refresh: for file_doc in to_refresh:
count = proj_coll.count({'_id': file_doc['project']})
if count == 0:
log.debug('Skipping file %s, project does not exist.', file_doc['_id'])
continue
log.debug('Refreshing links for file %s', file_doc['_id']) log.debug('Refreshing links for file %s', file_doc['_id'])
_generate_all_links(file_doc, now) _generate_all_links(file_doc, now)
refreshed += 1
log.info('Refreshed %i links', min(chunk_size, to_refresh.count())) log.info('Refreshed %i links', refreshed)
@require_login() @require_login()