Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/361711 )
Change subject: Switch Thumbor back on
......................................................................
Switch Thumbor back on
Bug: T168949
Change-Id: Id8331240c748d6d783b5b4d4373690cd1e932a0d
---
M modules/swift/files/SwiftMedia/wmf/rewrite.py
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/361711/1
diff --git a/modules/swift/files/SwiftMedia/wmf/rewrite.py
b/modules/swift/files/SwiftMedia/wmf/rewrite.py
index dd72e2e..5dd5ab2 100644
--- a/modules/swift/files/SwiftMedia/wmf/rewrite.py
+++ b/modules/swift/files/SwiftMedia/wmf/rewrite.py
@@ -91,7 +91,7 @@
thumbor_reqorig.host = self.thumborhost
thumbor_urlobj = list(urlparse.urlsplit(thumbor_reqorig.url))
thumbor_urlobj[2] = urllib2.quote(thumbor_urlobj[2], '%/')
- # thumbor_encodedurl = urlparse.urlunsplit(thumbor_urlobj)
+ thumbor_encodedurl = urlparse.urlunsplit(thumbor_urlobj)
# if sitelang, we're supposed to mangle the URL so that
#
http://upload.wm.o/wikipedia/commons/thumb/a/a2/Foo_.jpg/330px-Foo_.jpg
@@ -147,8 +147,8 @@
# To turn thumbor off and have thumbnail traffic served by image
scalers,
# replace the line below with this one:
- upcopy = opener.open(encodedurl)
- # upcopy = thumbor_opener.open(thumbor_encodedurl)
+ # 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
--
To view, visit https://gerrit.wikimedia.org/r/361711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8331240c748d6d783b5b4d4373690cd1e932a0d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
