Merge commit 'cf7d3c90d' into dinsic

1 files changed, 4 insertions, 2 deletions

diff --git a/synapse/config/repository.py b/synapse/config/repository.py

index bc02754a33..2c2f7449d0 100644
--- a/synapse/config/repository.py
+++ b/synapse/config/repository.py
@@ -148,7 +148,7 @@ class ContentRepositoryConfig(Config):
         # them to be started.
         self.media_storage_providers = []  # type: List[tuple]
 
-        for provider_config in storage_providers:
+        for i, provider_config in enumerate(storage_providers):
             # We special case the module "file_system" so as not to need to
             # expose FileStorageProviderBackend
             if provider_config["module"] == "file_system":
@@ -157,7 +157,9 @@ class ContentRepositoryConfig(Config):
                     ".FileStorageProviderBackend"
                 )
 
-            provider_class, parsed_config = load_module(provider_config)
+            provider_class, parsed_config = load_module(
+                provider_config, ("media_storage_providers", "<item %i>" % i)
+            )
 
             wrapper_config = MediaStorageProviderConfig(
                 provider_config.get("store_local", False),