diff --git a/colab/plugins/tasks.py b/colab/plugins/tasks.py index d813f99..4377705 100644 --- a/colab/plugins/tasks.py +++ b/colab/plugins/tasks.py @@ -2,10 +2,10 @@ from datetime import timedelta from celery.decorators import periodic_task -from .utils import data +from .data import TASKS -@periodic_task(run_every=timedelta(minutes=1)) +@periodic_task(run_every=timedelta(seconds=5)) def import_plugin_data(): - for task in data.TASKS: + for task in TASKS: task.delay() diff --git a/colab/utils/conf.py b/colab/utils/conf.py index 4577f42..0230fe2 100644 --- a/colab/utils/conf.py +++ b/colab/utils/conf.py @@ -3,7 +3,6 @@ import os import sys import logging import importlib -import warnings from django.core.exceptions import ImproperlyConfigured @@ -96,17 +95,21 @@ def load_colab_apps(): return {'COLAB_APPS': COLAB_APPS} for file_name in os.listdir(plugins_dir): - if not file_name.endswith('.py'): - continue - file_module = file_name.split('.')[0] + + logger.info('Loaded plugin settings: %s%s', plugins_dir, file_name) py_settings_d = _load_py_file(file_module, plugins_dir) - logger.info('Loaded plugin settings: %s/%s', plugins_dir, file_name) - app_name = py_settings_d.get('name') + if os.path.isdir(os.path.join(plugins_dir, file_name)): + app_name = file_name + + elif file_name.endswith('.py'): + app_name = py_settings_d.get('name') + if not app_name: - warnings.warn("Plugin missing name variable") + logger.warning("Plugin missing name variable (%s)", file_name) continue + try: importlib.import_module(app_name) except ImportError: -- libgit2 0.21.2