aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/celery_setup/from_celery.py
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2011-05-08 00:55:57 +0200
committerJoar Wandborg <git@wandborg.com>2011-05-08 00:55:57 +0200
commit4c093e85c7457e989b22b5274f240e3ccfdab210 (patch)
tree0a5c8fe8a3e38ef18ab1eedbe99c7df5931f4b13 /mediagoblin/celery_setup/from_celery.py
parenta083786dcfc8499384ae600bf4f2c68a5d5639bf (diff)
downloadmediagoblin-4c093e85c7457e989b22b5274f240e3ccfdab210.tar.lz
mediagoblin-4c093e85c7457e989b22b5274f240e3ccfdab210.tar.xz
mediagoblin-4c093e85c7457e989b22b5274f240e3ccfdab210.zip
Made changes according to http://bugs.foocorp.net/issues/271#note-7
Signed-off-by: Joar Wandborg <git@wandborg.com>
Diffstat (limited to 'mediagoblin/celery_setup/from_celery.py')
-rw-r--r--mediagoblin/celery_setup/from_celery.py4
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..387538e6 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.org'),
queue_store=queue_store)