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

from_celery.setup_self() didn't pay attention to default_conf_file kwarg, fixed.

Browse Source
This commit is contained in:
Christopher Allan Webber 2012-05-20 15:17:49 -05:00
parent 355fd6770d
commit a8acb5a387
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mediagoblin/init/celery/from_celery.py
View File

@ -35,10 +35,11 @@ def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME,
Note that if celery_setup_elsewhere is set in your config file, Note that if celery_setup_elsewhere is set in your config file,
this simply won't work. this simply won't work.
""" """
if os.path.exists(os.path.abspath('mediagoblin_local.ini')): if not default_conf_file:
default_conf_file = 'mediagoblin_local.ini' if os.path.exists(os.path.abspath('mediagoblin_local.ini')):
else: default_conf_file = 'mediagoblin_local.ini'
default_conf_file = 'mediagoblin.ini' else:
default_conf_file = 'mediagoblin.ini'
if check_environ_for_conf: if check_environ_for_conf:
mgoblin_conf_file = os.path.abspath( mgoblin_conf_file = os.path.abspath(