Module: check_mk Branch: master Commit: 1a8daeadc3f34738cdb2064bba924b1e51614f39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a8daeadc3f347… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 10 20:19:16 2014 +0200 Multisite: plugin loading does not catch all AttributeError exceptions anymore --- web/htdocs/index.py | 5 ++--- web/htdocs/notify.py | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 3c97a02..19dc482 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -63,11 +63,10 @@ def load_all_plugins(): for module in [ hooks, userdb, views, sidebar, dashboard, wato, bi, mobile, notify ]: try: module.load_plugins # just check if this function exists - module.load_plugins() except AttributeError: pass - except Exception: - raise + else: + module.load_plugins() # Load reporting plugins (only available in subscription version) try: diff --git a/web/htdocs/notify.py b/web/htdocs/notify.py index 40d088f..276c3f9 100644 --- a/web/htdocs/notify.py +++ b/web/htdocs/notify.py @@ -71,9 +71,6 @@ def load_plugins(): if loaded_with_language == current_language: return - global g_message_path - g_message_path = config.user_confdir + '/messages.mk' - global notify_methods notify_methods = { 'gui_popup': {