diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-19 16:51:14 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-19 16:51:14 -0500 |
| commit | c5d8d30182731f8e689574e096f663dcf665360d (patch) | |
| tree | 3ebe448eaaced8253004b28d601e05e5a293df9f /mediagoblin/init | |
| parent | 97e0a79f394c00d6837a97ad7f55cb4c36a8d930 (diff) | |
| download | mediagoblin-c5d8d30182731f8e689574e096f663dcf665360d.tar.lz mediagoblin-c5d8d30182731f8e689574e096f663dcf665360d.tar.xz mediagoblin-c5d8d30182731f8e689574e096f663dcf665360d.zip | |
removing old callable utilities and porting stuff over.
Diffstat (limited to 'mediagoblin/init')
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 4 | ||||
| -rw-r--r-- | mediagoblin/init/celery/from_celery.py | 4 | ||||
| -rw-r--r-- | mediagoblin/init/plugins/__init__.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index bb0d5989..169cc935 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 callable_runall +from mediagoblin.tools.pluginapi import hook_runall MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing.task'] @@ -66,7 +66,7 @@ def setup_celery_app(app_config, global_config, celery_app = Celery() celery_app.config_from_object(celery_settings) - callable_runall('celery_setup', celery_app) + hook_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 e2899c0b..b395a826 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 callable_runall +from mediagoblin.tools.pluginapi import hook_runall OUR_MODULENAME = __name__ @@ -47,7 +47,7 @@ def setup_logging_from_paste_ini(loglevel, **kw): logging.config.fileConfig(logging_conf_file) - callable_runall('celery_logging_setup') + hook_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 72bd5c7d..0df4f381 100644 --- a/mediagoblin/init/plugins/__init__.py +++ b/mediagoblin/init/plugins/__init__.py @@ -59,4 +59,4 @@ def setup_plugins(): pman.register_hooks(plugin.hooks) # Execute anything registered to the setup hook. - pluginapi.callable_runall('setup') + pluginapi.hook_runall('setup') |