diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-10 17:52:49 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-10 17:52:49 -0500 |
| commit | 04f295e20db4f8b170d2b0ec21eea850f7aa2bd5 (patch) | |
| tree | 1c49fee0176b1560c78dd6f4a5c8c77e991e2e44 /mediagoblin/init | |
| parent | 0a5c6ec9011f678d9759183cb22e747d1084769f (diff) | |
| download | mediagoblin-04f295e20db4f8b170d2b0ec21eea850f7aa2bd5.tar.lz mediagoblin-04f295e20db4f8b170d2b0ec21eea850f7aa2bd5.tar.xz mediagoblin-04f295e20db4f8b170d2b0ec21eea850f7aa2bd5.zip | |
Switch several functions over to using the new callable_run* tools!
Diffstat (limited to 'mediagoblin/init')
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 5 | ||||
| -rw-r--r-- | mediagoblin/init/celery/from_celery.py | 6 | ||||
| -rw-r--r-- | mediagoblin/init/plugins/__init__.py | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index 8d7a41bd..bb0d5989 100644 --- a/mediagoblin/init/celery/__init__.py +++ b/mediagoblin/init/celery/__init__.py @@ -18,7 +18,7 @@ import os import sys from celery import Celery -from mediagoblin.tools.pluginapi import PluginManager +from mediagoblin.tools.pluginapi import callable_runall MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing.task'] @@ -66,8 +66,7 @@ def setup_celery_app(app_config, global_config, celery_app = Celery() celery_app.config_from_object(celery_settings) - for callable_hook in PluginManager().get_hook_callables('celery_setup'): - callable_hook(celery_app) + callable_runall('celery_setup', celery_app) def setup_celery_from_config(app_config, global_config, diff --git a/mediagoblin/init/celery/from_celery.py b/mediagoblin/init/celery/from_celery.py index 8a794abb..e2899c0b 100644 --- a/mediagoblin/init/celery/from_celery.py +++ b/mediagoblin/init/celery/from_celery.py @@ -22,7 +22,7 @@ from celery.signals import setup_logging from mediagoblin import app, mg_globals from mediagoblin.init.celery import setup_celery_from_config -from mediagoblin.tools.pluginapi import PluginManager +from mediagoblin.tools.pluginapi import callable_runall OUR_MODULENAME = __name__ @@ -47,9 +47,7 @@ def setup_logging_from_paste_ini(loglevel, **kw): logging.config.fileConfig(logging_conf_file) - for callable_hook in \ - PluginManager().get_hook_callables('celery_logging_setup'): - callable_hook() + callable_runall('celery_logging_setup') setup_logging.connect(setup_logging_from_paste_ini) diff --git a/mediagoblin/init/plugins/__init__.py b/mediagoblin/init/plugins/__init__.py index cdf9b5ad..72bd5c7d 100644 --- a/mediagoblin/init/plugins/__init__.py +++ b/mediagoblin/init/plugins/__init__.py @@ -59,6 +59,4 @@ def setup_plugins(): pman.register_hooks(plugin.hooks) # Execute anything registered to the setup hook. - setup_list = pman.get_hook_callables('setup') - for fun in setup_list: - fun() + pluginapi.callable_runall('setup') |