No bug: [source-docs] Log the file being uploaded; r=gps

Differential Revision: https://phabricator.services.mozilla.com/D1479
This commit is contained in:
Tom Prince 2018-06-01 18:13:08 +00:00
Родитель f1eddfcf6a
Коммит 09e6aba6a8
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -54,7 +54,7 @@ def s3_upload(files, key_prefix=None):
s3 = session.client('s3',
config=botocore.client.Config(max_pool_connections=20))
def upload(f, bucket, key, extra_args):
def upload(f, path, bucket, key, extra_args):
# Need to flush to avoid buffering/interleaving from multiple threads.
sys.stdout.write('uploading %s to %s\n' % (path, key))
sys.stdout.flush()
@ -77,7 +77,7 @@ def s3_upload(files, key_prefix=None):
# The file types returned by mozpack behave like file objects. But
# they don't accept an argument to read(). So we wrap in a BytesIO.
fs.append(e.submit(upload, io.BytesIO(f.read()), bucket, key,
fs.append(e.submit(upload, io.BytesIO(f.read()), path, bucket, key,
extra_args))
# Need to do this to catch any exceptions.