From 8a579d92362c15874ab6e4480b4ad157d56c8f4b Mon Sep 17 00:00:00 2001
From: Jillian Vogel <jill@opencraft.com>
Date: Thu, 22 Mar 2018 17:02:13 +1030
Subject: [PATCH] Set SWIFT_CONTENT_LENGTH_FROM_FD=False
Works around a bug with Django SWIFT storage uploads in edx-platform, cf
https://github.com/dennisv/django-storage-swift/pull/100
Also adds SWIFT_LAZY_CONNECT to cms.envs.openstack, to balance with the lms settings.
---
cms/envs/openstack.py | 2 ++
lms/envs/openstack.py | 1 +
requirements/edx/openstack.txt | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/cms/envs/openstack.py b/cms/envs/openstack.py
index 53a2e91c5e1..a69dd166c59 100644
--- a/cms/envs/openstack.py
+++ b/cms/envs/openstack.py
@@ -17,6 +17,8 @@ SWIFT_NAME_PREFIX = FILE_UPLOAD_STORAGE_PREFIX
SWIFT_USE_TEMP_URLS = AUTH_TOKENS.get('SWIFT_USE_TEMP_URLS', False)
SWIFT_TEMP_URL_KEY = AUTH_TOKENS.get('SWIFT_TEMP_URL_KEY')
SWIFT_TEMP_URL_DURATION = AUTH_TOKENS.get('SWIFT_TEMP_URL_DURATION', 1800) # seconds
+SWIFT_CONTENT_LENGTH_FROM_FD = AUTH_TOKENS.get('SWIFT_CONTENT_LENGTH_FROM_FD', False)
+SWIFT_LAZY_CONNECT = AUTH_TOKENS.get('SWIFT_LAZY_CONNECT', True)
if AUTH_TOKENS.get('SWIFT_REGION_NAME'):
SWIFT_EXTRA_OPTIONS = {'region_name': AUTH_TOKENS['SWIFT_REGION_NAME']}
diff --git a/lms/envs/openstack.py b/lms/envs/openstack.py
index 10b5f1472c2..bf420c5053a 100644
--- a/lms/envs/openstack.py
+++ b/lms/envs/openstack.py
@@ -18,6 +18,7 @@ SWIFT_USE_TEMP_URLS = AUTH_TOKENS.get('SWIFT_USE_TEMP_URLS', False)
SWIFT_TEMP_URL_KEY = AUTH_TOKENS.get('SWIFT_TEMP_URL_KEY')
SWIFT_TEMP_URL_DURATION = AUTH_TOKENS.get('SWIFT_TEMP_URL_DURATION', 1800) # seconds
SWIFT_CONTENT_TYPE_FROM_FD = AUTH_TOKENS.get('SWIFT_CONTENT_TYPE_FROM_FD', True)
+SWIFT_CONTENT_LENGTH_FROM_FD = AUTH_TOKENS.get('SWIFT_CONTENT_LENGTH_FROM_FD', False)
SWIFT_LAZY_CONNECT = AUTH_TOKENS.get('SWIFT_LAZY_CONNECT', True)
if AUTH_TOKENS.get('SWIFT_REGION_NAME'):
diff --git a/requirements/edx/openstack.txt b/requirements/edx/openstack.txt
index 2b3d1c1dbb0..1d576b10821 100644
--- a/requirements/edx/openstack.txt
+++ b/requirements/edx/openstack.txt
@@ -3,4 +3,4 @@
#
# OpenStack swift backend for django storage API
-django-storage-swift==1.2.18
+django-storage-swift==1.2.19
--
GitLab