heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'remotes/elrond/idea/clean_celery_setup'

Browse Source 
Conflicts:
	mediagoblin/celery_setup/from_celery.py
This commit is contained in:
Christopher Allan Webber 2011-06-12 09:16:12 -05:00
commit da579dec00
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/celery_setup/from_celery.py
View File

@ -26,10 +26,10 @@ from mediagoblin.globals import setup_globals
from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR
OUR_MODULENAME = 'mediagoblin.celery_setup.from_celery' OUR_MODULENAME = __name__
def setup_self(setup_globals_func=setup_globals): def setup_self():
""" """
Transform this module into a celery config module by reading the Transform this module into a celery config module by reading the
mediagoblin config file. Set the environment variable mediagoblin config file. Set the environment variable
@ -80,7 +80,7 @@ def setup_self(setup_globals_func=setup_globals):
mgoblin_section.get( mgoblin_section.get(
'workbench_path', DEFAULT_WORKBENCH_DIR)) 'workbench_path', DEFAULT_WORKBENCH_DIR))
setup_globals_func( setup_globals(
db_connection=connection, db_connection=connection,
database=db, database=db,
public_store=public_store, public_store=public_store,

5
mediagoblin/celery_setup/from_tests.py
View File

@ -19,13 +19,12 @@ import os
from mediagoblin.tests.tools import TEST_APP_CONFIG from mediagoblin.tests.tools import TEST_APP_CONFIG
from mediagoblin import util from mediagoblin import util
from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.celery_setup import setup_celery_from_config
from mediagoblin.globals import setup_globals
OUR_MODULENAME = 'mediagoblin.celery_setup.from_tests' OUR_MODULENAME = __name__
def setup_self(setup_globals_func=setup_globals): def setup_self():
""" """
Set up celery for testing's sake, which just needs to set up Set up celery for testing's sake, which just needs to set up
celery and celery only. celery and celery only.