diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-05-07 20:05:28 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-05-07 20:05:28 -0500 |
| commit | 9fa51f07af5981a7d119aa6b5ea52ea6bba600cf (patch) | |
| tree | 585c68bc02645659d70aeb146608e3dca97ffef0 /mediagoblin/celery_setup/from_celery.py | |
| parent | 7a5ddb45dcf55c6d651b4a32dc1924e54b77c0f0 (diff) | |
| parent | 8a6a81bcaa557f1d7ceebea8b372be7cc3423ca2 (diff) | |
| download | mediagoblin-9fa51f07af5981a7d119aa6b5ea52ea6bba600cf.tar.lz mediagoblin-9fa51f07af5981a7d119aa6b5ea52ea6bba600cf.tar.xz mediagoblin-9fa51f07af5981a7d119aa6b5ea52ea6bba600cf.zip | |
Merge remote branch 'refs/remotes/jwandborg/master'
Diffstat (limited to 'mediagoblin/celery_setup/from_celery.py')
| -rw-r--r-- | mediagoblin/celery_setup/from_celery.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py index 9bd7fe07..218ebfeb 100644 --- a/mediagoblin/celery_setup/from_celery.py +++ b/mediagoblin/celery_setup/from_celery.py @@ -22,6 +22,7 @@ from paste.deploy.loadwsgi import NicerConfigParser from mediagoblin import storage, models from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.globals import setup_globals +from mediagoblin import globals as mgoblin_globals OUR_MODULENAME = 'mediagoblin.celery_setup.from_celery' @@ -81,6 +82,9 @@ def setup_self(setup_globals_func=setup_globals): db_connection=connection, database=db, public_store=public_store, + email_sender_address=mgoblin_section.get( + 'email_sender_address', + 'notice@mediagoblin.example.org'), queue_store=queue_store) |