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

Nicer logging when refreshing file links

Browse Source
This commit is contained in:
Sybren A. Stüvel
2018-12-20 12:51:53 +01:00
parent ef259345ce
commit beac125ff9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pillar/api/file_storage/__init__.py
View File

@@ -609,6 +609,7 @@ def refresh_links_for_backend(backend_name, chunk_size, expiry_seconds):
import gcloud.exceptions import gcloud.exceptions
my_log = log.getChild(f'refresh_links_for_backend.{backend_name}') my_log = log.getChild(f'refresh_links_for_backend.{backend_name}')
start_time = time.time()
# Retrieve expired links. # Retrieve expired links.
files_collection = current_app.data.driver.db['files'] files_collection = current_app.data.driver.db['files']
@@ -632,10 +633,10 @@ def refresh_links_for_backend(backend_name, chunk_size, expiry_seconds):
return return
if 0 < chunk_size == document_count: if 0 < chunk_size == document_count:
my_log.info('Found %d documents to refresh, probably limited by the chunk size.', my_log.info('Found %d documents to refresh, probably limited by the chunk size %d',
document_count) document_count, chunk_size)
else: else:
my_log.info('Found %d documents to refresh.', document_count) my_log.info('Found %d documents to refresh, chunk size=%d', document_count, chunk_size)
refreshed = 0 refreshed = 0
report_chunks = min(max(5, document_count // 25), 100) report_chunks = min(max(5, document_count // 25), 100)
@@ -679,8 +680,10 @@ def refresh_links_for_backend(backend_name, chunk_size, expiry_seconds):
'links', refreshed) 'links', refreshed)
return return
if refreshed % report_chunks != 0:
my_log.info('Refreshed %i links', refreshed) my_log.info('Refreshed %i links', refreshed)
my_log.info('Refresh took %s', datetime.timedelta(seconds=time.time() - start))
@require_login() @require_login()
def create_file_doc(name, filename, content_type, length, project, def create_file_doc(name, filename, content_type, length, project,