Merge pull request #136 from Uxio0/master

Add AWS_S3_USE_THREADS

Author: etianen

CHANGELOG.rst

@@ -1,6 +1,10 @@
 django-s3-storage changelog
 ===========================
 
+0.13.6
+------
+- Adding `AWS_S3_USE_THREADS` to fix `gevent` issues (@uxio0).
+
 0.13.5
 ------
 

README.rst

@@ -116,6 +116,10 @@ Use the following settings to configure the S3 file storage. You must provide at
     # extra characters appended.
     AWS_S3_FILE_OVERWRITE = False
 
+    # If True, use default behaviour for boto3 of using threads when doing S3 operations. If gevent or similar
+    # is used it must be disabled
+    AWS_S3_USE_THREADS = True
+
 **Important:** Several of these settings (noted above) will not affect existing files. To sync the new settings to
 existing files, run ``./manage.py s3_sync_meta django.core.files.storage.default_storage``.
 

django_s3_storage/storage.py

@@ -15,6 +15,7 @@
 
 import boto3
 from botocore.client import Config
+from boto3.s3.transfer import TransferConfig
 from botocore.exceptions import ClientError
 from django.conf import settings
 from django.contrib.staticfiles.storage import ManifestFilesMixin
@@ -149,7 +150,8 @@ class S3Storage(Storage):
         "AWS_S3_KMS_ENCRYPTION_KEY_ID": "",
         "AWS_S3_GZIP": True,
         "AWS_S3_SIGNATURE_VERSION": "s3v4",
-        "AWS_S3_FILE_OVERWRITE": False
+        "AWS_S3_FILE_OVERWRITE": False,
+        "AWS_S3_USE_THREADS": True,
     }
 
     s3_settings_suffix = ""
@@ -188,6 +190,8 @@ def _setup(self):
             )
         # Create a thread-local connection manager.
         self._connections = _Local(self)
+        # Set transfer config for S3 operations
+        self._transfer_config = TransferConfig(use_threads=self.settings.AWS_S3_USE_THREADS)
 
     @property
     def s3_connection(self):
@@ -326,7 +330,7 @@ def _save(self, name, content):
                     content.seek(0)
         # Save the file.
         self.s3_connection.upload_fileobj(content, put_params.pop('Bucket'), put_params.pop('Key'),
-                                          ExtraArgs=put_params)
+                                          ExtraArgs=put_params, Config=self._transfer_config)
         # Close all temp files.
         for temp_file in temp_files:
             temp_file.close()