mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-03 01:54:48 -04:00
Better formatting for config errors from modules (#8874)
The idea is that the parse_config method of extension modules can raise either a ConfigError or a JsonValidationError, and it will be magically turned into a legible error message. There's a few components to it: * Separating the "path" and the "message" parts of a ConfigError, so that we can fiddle with the path bit to turn it into an absolute path. * Generally improving the way ConfigErrors get printed. * Passing in the config path to load_module so that it can wrap any exceptions that get caught appropriately.
This commit is contained in:
parent
36ba73f53d
commit
ab7a24cc6b
13 changed files with 159 additions and 36 deletions
|
@ -15,28 +15,56 @@
|
|||
|
||||
import importlib
|
||||
import importlib.util
|
||||
import itertools
|
||||
from typing import Any, Iterable, Tuple, Type
|
||||
|
||||
import jsonschema
|
||||
|
||||
from synapse.config._base import ConfigError
|
||||
from synapse.config._util import json_error_to_config_error
|
||||
|
||||
|
||||
def load_module(provider):
|
||||
def load_module(provider: dict, config_path: Iterable[str]) -> Tuple[Type, Any]:
|
||||
""" Loads a synapse module with its config
|
||||
Take a dict with keys 'module' (the module name) and 'config'
|
||||
(the config dict).
|
||||
|
||||
Args:
|
||||
provider: a dict with keys 'module' (the module name) and 'config'
|
||||
(the config dict).
|
||||
config_path: the path within the config file. This will be used as a basis
|
||||
for any error message.
|
||||
|
||||
Returns
|
||||
Tuple of (provider class, parsed config object)
|
||||
"""
|
||||
|
||||
modulename = provider.get("module")
|
||||
if not isinstance(modulename, str):
|
||||
raise ConfigError(
|
||||
"expected a string", path=itertools.chain(config_path, ("module",))
|
||||
)
|
||||
|
||||
# We need to import the module, and then pick the class out of
|
||||
# that, so we split based on the last dot.
|
||||
module, clz = provider["module"].rsplit(".", 1)
|
||||
module, clz = modulename.rsplit(".", 1)
|
||||
module = importlib.import_module(module)
|
||||
provider_class = getattr(module, clz)
|
||||
|
||||
module_config = provider.get("config")
|
||||
try:
|
||||
provider_config = provider_class.parse_config(provider.get("config"))
|
||||
provider_config = provider_class.parse_config(module_config)
|
||||
except jsonschema.ValidationError as e:
|
||||
raise json_error_to_config_error(e, itertools.chain(config_path, ("config",)))
|
||||
except ConfigError as e:
|
||||
raise _wrap_config_error(
|
||||
"Failed to parse config for module %r" % (modulename,),
|
||||
prefix=itertools.chain(config_path, ("config",)),
|
||||
e=e,
|
||||
)
|
||||
except Exception as e:
|
||||
raise ConfigError("Failed to parse config for %r: %s" % (provider["module"], e))
|
||||
raise ConfigError(
|
||||
"Failed to parse config for module %r" % (modulename,),
|
||||
path=itertools.chain(config_path, ("config",)),
|
||||
) from e
|
||||
|
||||
return provider_class, provider_config
|
||||
|
||||
|
@ -56,3 +84,27 @@ def load_python_module(location: str):
|
|||
mod = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(mod) # type: ignore
|
||||
return mod
|
||||
|
||||
|
||||
def _wrap_config_error(
|
||||
msg: str, prefix: Iterable[str], e: ConfigError
|
||||
) -> "ConfigError":
|
||||
"""Wrap a relative ConfigError with a new path
|
||||
|
||||
This is useful when we have a ConfigError with a relative path due to a problem
|
||||
parsing part of the config, and we now need to set it in context.
|
||||
"""
|
||||
path = prefix
|
||||
if e.path:
|
||||
path = itertools.chain(prefix, e.path)
|
||||
|
||||
e1 = ConfigError(msg, path)
|
||||
|
||||
# ideally we would set the 'cause' of the new exception to the original exception;
|
||||
# however now that we have merged the path into our own, the stringification of
|
||||
# e will be incorrect, so instead we create a new exception with just the "msg"
|
||||
# part.
|
||||
|
||||
e1.__cause__ = Exception(e.msg)
|
||||
e1.__cause__.__cause__ = e.__cause__
|
||||
return e1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue