diff options
| -rw-r--r-- | askbot/models/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/tasks.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index d0ea2934..09ec0018 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2435,7 +2435,7 @@ def send_instant_notifications_about_activity_in_post( reply_address = "noreply" if user.reputation >= askbot_settings.MIN_REP_TO_POST_BY_EMAIL: reply_address = ReplyAddress.objects.create_new(post, user).address - reply_to = 'reply-%s@%s' % (reply_address, askbot_settings.REPLY_BY_EMAIL_HOST_NAME) + reply_to = 'reply-%s@%s' % (reply_address, askbot_settings.REPLY_BY_EMAIL_HOSTNAME) headers.update({'Reply-To': reply_to}) else: reply_to = django_settings.DEFAULT_FROM_EMAIL diff --git a/askbot/tasks.py b/askbot/tasks.py index d94e0a68..e5ba143d 100644 --- a/askbot/tasks.py +++ b/askbot/tasks.py @@ -58,10 +58,9 @@ def record_post_update_celery_task( diff = diff ) except Exception: - if 'test' in sys.argv: - # HACK: exceptions from Celery job don;t propagate upwards to Django test runner - # so at least le't sprint tracebacks - print >>sys.stderr, traceback.format_exc() + # HACK: exceptions from Celery job don;t propagate upwards to Django test runner + # so at least le't sprint tracebacks + print >>sys.stderr, traceback.format_exc() raise def record_post_update( |