diff options
Diffstat (limited to 'mediagoblin/init')
| -rw-r--r-- | mediagoblin/init/__init__.py | 5 | ||||
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 57 | ||||
| -rw-r--r-- | mediagoblin/init/celery/from_celery.py | 8 | ||||
| -rw-r--r-- | mediagoblin/init/plugins/__init__.py | 59 |
4 files changed, 111 insertions, 18 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index 7ac59db1..1d8115cb 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -24,7 +24,7 @@ from mediagoblin.init.config import ( from mediagoblin import mg_globals from mediagoblin.mg_globals import setup_globals from mediagoblin.db.open import setup_connection_and_db_from_config, \ - check_db_migrations_current + check_db_migrations_current, load_models from mediagoblin.workbench import WorkbenchManager from mediagoblin.storage import storage_system_from_config @@ -56,6 +56,9 @@ def setup_global_and_app_config(config_path): def setup_database(): app_config = mg_globals.app_config + # Load all models for media types (plugins, ...) + load_models(app_config) + # Set up the database connection, db = setup_connection_and_db_from_config(app_config) diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index 29ccd83a..fc595ea7 100644 --- a/mediagoblin/init/celery/__init__.py +++ b/mediagoblin/init/celery/__init__.py @@ -17,28 +17,18 @@ import os import sys +from celery import Celery -MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing'] + +MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing.task'] DEFAULT_SETTINGS_MODULE = 'mediagoblin.init.celery.dummy_settings_module' -def setup_celery_from_config(app_config, global_config, - settings_module=DEFAULT_SETTINGS_MODULE, - force_celery_always_eager=False, - set_environ=True): +def get_celery_settings_dict(app_config, global_config, + force_celery_always_eager=False): """ - Take a mediagoblin app config and try to set up a celery settings - module from this. - - Args: - - app_config: the application config section - - global_config: the entire ConfigObj loaded config, all sections - - settings_module: the module to populate, as a string - - force_celery_always_eager: whether or not to force celery into - always eager mode; good for development and small installs - - set_environ: if set, this will CELERY_CONFIG_MODULE to the - settings_module + Get a celery settings dictionary from reading the config """ if 'celery' in global_config: celery_conf = global_config['celery'] @@ -61,6 +51,41 @@ def setup_celery_from_config(app_config, global_config, celery_settings['CELERY_ALWAYS_EAGER'] = True celery_settings['CELERY_EAGER_PROPAGATES_EXCEPTIONS'] = True + return celery_settings + + +def setup_celery_app(app_config, global_config, + settings_module=DEFAULT_SETTINGS_MODULE, + force_celery_always_eager=False): + """ + Setup celery without using terrible setup-celery-module hacks. + """ + celery_settings = get_celery_settings_dict( + app_config, global_config, force_celery_always_eager) + celery_app = Celery() + celery_app.config_from_object(celery_settings) + + +def setup_celery_from_config(app_config, global_config, + settings_module=DEFAULT_SETTINGS_MODULE, + force_celery_always_eager=False, + set_environ=True): + """ + Take a mediagoblin app config and try to set up a celery settings + module from this. + + Args: + - app_config: the application config section + - global_config: the entire ConfigObj loaded config, all sections + - settings_module: the module to populate, as a string + - force_celery_always_eager: whether or not to force celery into + always eager mode; good for development and small installs + - set_environ: if set, this will CELERY_CONFIG_MODULE to the + settings_module + """ + celery_settings = get_celery_settings_dict( + app_config, global_config, force_celery_always_eager) + __import__(settings_module) this_module = sys.modules[settings_module] diff --git a/mediagoblin/init/celery/from_celery.py b/mediagoblin/init/celery/from_celery.py index 5a44efe3..b8297255 100644 --- a/mediagoblin/init/celery/from_celery.py +++ b/mediagoblin/init/celery/from_celery.py @@ -24,7 +24,7 @@ OUR_MODULENAME = __name__ def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME, - default_conf_file='mediagoblin.ini'): + default_conf_file=None): """ Transform this module into a celery config module by reading the mediagoblin config file. Set the environment variable @@ -35,6 +35,12 @@ def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME, Note that if celery_setup_elsewhere is set in your config file, this simply won't work. """ + if not default_conf_file: + if os.path.exists(os.path.abspath('mediagoblin_local.ini')): + default_conf_file = 'mediagoblin_local.ini' + else: + default_conf_file = 'mediagoblin.ini' + if check_environ_for_conf: mgoblin_conf_file = os.path.abspath( os.environ.get('MEDIAGOBLIN_CONFIG', default_conf_file)) diff --git a/mediagoblin/init/plugins/__init__.py b/mediagoblin/init/plugins/__init__.py new file mode 100644 index 00000000..279a5ede --- /dev/null +++ b/mediagoblin/init/plugins/__init__.py @@ -0,0 +1,59 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import logging + +from mediagoblin import mg_globals +from mediagoblin.tools import pluginapi + + +_log = logging.getLogger(__name__) + + +def setup_plugins(): + """This loads, configures and registers plugins + + See plugin documentation for more details. + """ + + global_config = mg_globals.global_config + plugin_section = global_config.get('plugins', {}) + + if not plugin_section: + _log.info("No plugins to load") + return + + pcache = pluginapi.PluginCache() + + # Go through and import all the modules that are subsections of + # the [plugins] section. + for plugin_module, config in plugin_section.items(): + _log.info("Importing plugin module: %s" % plugin_module) + # If this throws errors, that's ok--it'll halt mediagoblin + # startup. + __import__(plugin_module) + + # Note: One side-effect of importing things is that anything that + # subclassed pluginapi.Plugin is registered. + + # Go through all the plugin classes, instantiate them, and call + # setup_plugin so they can figure things out. + for plugin_class in pcache.plugin_classes: + name = plugin_class.__module__ + "." + plugin_class.__name__ + _log.info("Loading plugin: %s" % name) + plugin_obj = plugin_class() + plugin_obj.setup_plugin() + pcache.register_plugin_object(plugin_obj) |