Gilles has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362194 )
Change subject: Single-serve Thumbor thumbnails to default location ...................................................................... Single-serve Thumbor thumbnails to default location This matches the post-deployment state of production Change-Id: Ie6980cab3e92a5eb9db076afe0918acab6dee4b7 --- M puppet/modules/swift/files/SwiftMedia/wmf/rewrite.py M puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb 2 files changed, 2 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/94/362194/1 diff --git a/puppet/modules/swift/files/SwiftMedia/wmf/rewrite.py b/puppet/modules/swift/files/SwiftMedia/wmf/rewrite.py index b43b2af..0e091e5 100644 --- a/puppet/modules/swift/files/SwiftMedia/wmf/rewrite.py +++ b/puppet/modules/swift/files/SwiftMedia/wmf/rewrite.py @@ -133,13 +133,7 @@ else: self.logger.warn("no sitelang match on encodedurl: %s" % encodedurl) - if self.thumborhost: - if not self.thumbor_wiki_list or '-'.join((proj, lang)) in self.thumbor_wiki_list: - upcopy = thumbor_opener.open(thumbor_encodedurl) - else: - upcopy = opener.open(encodedurl) - else: - upcopy = opener.open(encodedurl) + upcopy = thumbor_opener.open(thumbor_encodedurl) except urllib2.HTTPError, error: # copy the urllib2 HTTPError into a webob HTTPError class as-is diff --git a/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb b/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb index 88ab086..173bd1c 100644 --- a/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb +++ b/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb @@ -39,7 +39,7 @@ 'wiki-dev-local-public', 'wiki-dev-local-thumb' ] -SWIFT_PATH_PREFIX = 'thumbor/' +#SWIFT_PATH_PREFIX = 'thumbor/' SWIFT_CONNECTION_TIMEOUT = 5 # Needs to be at least 1 due to bug in python-swiftclient < 3.1.0 https://bugs.launchpad.net/gnocchi/+bug/1589926 -- To view, visit https://gerrit.wikimedia.org/r/362194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6980cab3e92a5eb9db076afe0918acab6dee4b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits