summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-23 11:34:34 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-23 11:34:34 +0000
commit67ab74cb31edfafeb7f99e50b36f524faf2d9070 (patch)
treeff7c5d7eefc140b2094a583f960205aaaac638fa /synapse/util
parentImplement RedirectException (#6687) (diff)
parentMerge pull request #6688 from matrix-org/rav/module_api_extensions (diff)
downloadsynapse-67ab74cb31edfafeb7f99e50b36f524faf2d9070.tar.xz
Merge pull request #6688 from matrix-org/rav/module_api_extensions
* commit '608bf7d74':
  changelog
  Handle `config` not being set for synapse plugin modules
  Cleanups and additions to the module API
Diffstat (limited to 'synapse/util')
-rw-r--r--synapse/util/module_loader.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/module_loader.py b/synapse/util/module_loader.py
index 2705cbe5f8..bb62db4637 100644
--- a/synapse/util/module_loader.py
+++ b/synapse/util/module_loader.py
@@ -34,7 +34,7 @@ def load_module(provider):
     provider_class = getattr(module, clz)
 
     try:
-        provider_config = provider_class.parse_config(provider["config"])
+        provider_config = provider_class.parse_config(provider.get("config"))
     except Exception as e:
         raise ConfigError("Failed to parse config for %r: %r" % (provider["module"], e))