diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-05-20 15:17:49 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-05-20 15:17:49 -0500 |
| commit | a8acb5a387fd8b7365e6762d1f0573262ad5f596 (patch) | |
| tree | e3d5a0e0451d6cca2f37acbabe7d5dc2b02b1a60 /mediagoblin/init/celery | |
| parent | 355fd6770dce14cf45fd696cda542cb190bb42cb (diff) | |
| download | mediagoblin-a8acb5a387fd8b7365e6762d1f0573262ad5f596.tar.lz mediagoblin-a8acb5a387fd8b7365e6762d1f0573262ad5f596.tar.xz mediagoblin-a8acb5a387fd8b7365e6762d1f0573262ad5f596.zip | |
from_celery.setup_self() didn't pay attention to default_conf_file kwarg, fixed.
Diffstat (limited to 'mediagoblin/init/celery')
| -rw-r--r-- | mediagoblin/init/celery/from_celery.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mediagoblin/init/celery/from_celery.py b/mediagoblin/init/celery/from_celery.py index c20f02c7..b8297255 100644 --- a/mediagoblin/init/celery/from_celery.py +++ b/mediagoblin/init/celery/from_celery.py @@ -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, this simply won't work. """ - if os.path.exists(os.path.abspath('mediagoblin_local.ini')): - default_conf_file = 'mediagoblin_local.ini' - else: - default_conf_file = 'mediagoblin.ini' + 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( |