From 13023b660ea9a38f3be0dced66e51ac4f4fd4177 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Fri, 3 Nov 2017 02:42:56 +0100 Subject: [PATCH] Caching modules and plugins --- notifier.py | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/notifier.py b/notifier.py index 67440ca4..e1dae2ac 100644 --- a/notifier.py +++ b/notifier.py @@ -34,6 +34,9 @@ DEVICE_ID = config['device_id'] \ DEBUG = config['debug'] if 'debug' in config else False +modules = {} +plugins = {} + def on_open(ws): logging.info('Connection opened') @@ -48,24 +51,32 @@ def on_error(ws, error): def _exec_func(body): - module = None - try: - module = importlib.import_module('plugins.{}'.format(body['plugin'])) - except ModuleNotFoundError as e: - logging.warn('No such plugin: {}'.format(body['plugin'])) - return + module_name = 'plugins.{}'.format(body['plugin']) + if module_name in modules: + module = modules[module_name] + else: + try: + module = importlib.import_module(module_name) + modules[module_name] = module + except ModuleNotFoundError as e: + logging.warn('No such plugin: {}'.format(body['plugin'])) + return logging.info('Received push addressed to me: {}'.format(body)) args = body['args'] if 'args' in body else {} - cls = getattr( - module, functools.reduce( - lambda a,b: a.title() + b.title(), - (body['plugin'].title().split('.')) - ) + 'Plugin' - ) + cls_name = functools.reduce( + lambda a,b: a.title() + b.title(), + (body['plugin'].title().split('.')) + ) + 'Plugin' + + if cls_name in plugins: + instance = plugins[cls_name] + else: + cls = getattr(module, cls_name) + instance = cls() + plugins[cls_name] = cls - instance = cls() out, err = instance.run(args) logging.info('Command output: {}'.format(out))