Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/312841
Change subject: Use new https loader for Thumbor ...................................................................... Use new https loader for Thumbor Also stop using cgexec. It's useless considering that the parent thumbor process has the same memory limit. Change-Id: I179e4ba70cb38e7b9d201cb75fe57a96b581e197 --- M puppet/modules/thumbor/templates/thumbor.conf.erb 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/41/312841/1 diff --git a/puppet/modules/thumbor/templates/thumbor.conf.erb b/puppet/modules/thumbor/templates/thumbor.conf.erb index 4f8364e..76fcb6a 100644 --- a/puppet/modules/thumbor/templates/thumbor.conf.erb +++ b/puppet/modules/thumbor/templates/thumbor.conf.erb @@ -581,9 +581,6 @@ SUBPROCESS_USE_TIMEOUT = True SUBPROCESS_TIMEOUT_PATH = '/usr/bin/timeout' SUBPROCESS_TIMEOUT = 60 -SUBPROCESS_USE_CGEXEC = True -SUBPROCESS_CGEXEC_PATH = '/usr/bin/cgexec' -SUBPROCESS_CGROUP = 'memory:thumbor' VIPS_ENGINE_MIN_PIXELS = 10000000 @@ -619,7 +616,12 @@ ] PROXY_LOADER_LOADERS = [ - 'wikimedia_thumbor.loader.video' + 'wikimedia_thumbor.loader.video', + 'wikimedia_thumbor.loader.https' ] + +HTTP_LOADER_MAX_BODY_SIZE = 1024 * 1024 * 1024 +HTTP_LOADER_TEMP_FILE_TIMEOUT = 70 + ################################################################################ -- To view, visit https://gerrit.wikimedia.org/r/312841 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I179e4ba70cb38e7b9d201cb75fe57a96b581e197 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gilles <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
