Filippo Giunchedi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345608 )
Change subject: Upgrade to 0.1.38 ...................................................................... Upgrade to 0.1.38 Change-Id: I93538c139f924f7c186b95143e2862b676144a47 --- M debian/changelog M setup.py M wikimedia_thumbor/handler/images/images.py M wikimedia_thumbor/loader/swift/__init__.py 4 files changed, 17 insertions(+), 14 deletions(-) Approvals: jenkins-bot: Verified Filippo Giunchedi: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 1cbb0b3..7854c9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-thumbor-wikimedia (0.1.38-1) jessie-wikimedia; urgency=low + + * New upstream release + + -- Gilles Dubuc <[email protected]> Fri, 31 Mar 2017 00:32:00 +0000 + python-thumbor-wikimedia (0.1.37-1) jessie-wikimedia; urgency=low * New upstream release diff --git a/setup.py b/setup.py index 3292e68..07d6432 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name='wikimedia_thumbor', - version='0.1.37', + version='0.1.38', url='https://phabricator.wikimedia.org/diffusion/THMBREXT/', license='MIT', author='Gilles Dubuc, Wikimedia Foundation', diff --git a/wikimedia_thumbor/handler/images/images.py b/wikimedia_thumbor/handler/images/images.py index db6324f..ddd4f9e 100644 --- a/wikimedia_thumbor/handler/images/images.py +++ b/wikimedia_thumbor/handler/images/images.py @@ -68,9 +68,9 @@ self.set_status(status) if msg is not None: - if self.context.hasattr('request'): + try: logger.warn(msg, extra={'url': self.context.request.url}) - else: + except AttributeError: logger.warn(msg) self.finish() diff --git a/wikimedia_thumbor/loader/swift/__init__.py b/wikimedia_thumbor/loader/swift/__init__.py index fe21107..c1bef02 100644 --- a/wikimedia_thumbor/loader/swift/__init__.py +++ b/wikimedia_thumbor/loader/swift/__init__.py @@ -85,8 +85,7 @@ logging.disable(logging.ERROR) headers, response = swift(context).get_object( container, - path, - resp_chunk_size=context.config.HTTP_LOADER_MAX_BODY_SIZE + path ) context.metrics.incr('swift_loader.status.success') @@ -94,19 +93,17 @@ logging.disable(logging.NOTSET) f = NamedTemporaryFile(delete=False) - for chunk in response: - logger.debug( - '[SWIFT_LOADER] writing %d bytes to temp file' % len(chunk), - extra=log_extra - ) - f.write(chunk) + logger.debug( + '[SWIFT_LOADER] writing %d bytes to temp file' % len(response), + extra=log_extra + ) + f.write(response) + f.close() excerpt_length = context.config.LOADER_EXCERPT_LENGTH - f.seek(0) # First kb of the body for MIME detection - body = f.read(excerpt_length) - f.close() + body = response[:excerpt_length] if len(body) == excerpt_length: logger.debug('[SWIFT_LOADER] return_contents: %s' % f.name, extra=log_extra) -- To view, visit https://gerrit.wikimedia.org/r/345608 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93538c139f924f7c186b95143e2862b676144a47 Gerrit-PatchSet: 3 Gerrit-Project: operations/debs/python-thumbor-wikimedia Gerrit-Branch: master Gerrit-Owner: Gilles <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
