From 5d2d8f4267213a0ac352ad8c2e7904e48c3d10f7 Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Mon, 6 Jun 2016 11:26:27 +0200 Subject: [PATCH] authn: Make the legacy plugin import more robust if something fails during import. --- rhodecode/authentication/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rhodecode/authentication/__init__.py b/rhodecode/authentication/__init__.py index 24e2f046..83204eab 100644 --- a/rhodecode/authentication/__init__.py +++ b/rhodecode/authentication/__init__.py @@ -72,13 +72,16 @@ def _discover_legacy_plugins(config, prefix=legacy_plugin_prefix): for plugin_id in legacy_plugins: module_name = plugin_id.split(prefix, 1)[-1] try: - log.debug('Import %s', module_name) module = importlib.import_module(module_name) plugin = module.plugin_factory(plugin_id=plugin_id) config.include(plugin.includeme) except ImportError as e: log.error( - 'Error while importing legacy authentication plugin ' + 'ImportError while importing legacy authentication plugin ' + '"{}": {}'.format(plugin_id, e.message)) + except Exception as e: + log.error( + 'Exception while importing legacy authentication plugin ' '"{}": {}'.format(plugin_id, e.message))