diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-24 11:24:55 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-24 11:24:55 +0000 |
| commit | 63586e47e1b53bca023fdbba83bff2cd138feaf3 (patch) | |
| tree | 5c9ed659c968f092317de6bab59a712e2584ca66 /app/controllers/application_controller.rb | |
| parent | 80e66c0fba234fc78f13d5e7635f65d2bc25fe58 (diff) | |
| parent | b0a939a4d44077b4602176042ff4432b790561ad (diff) | |
Merge branch 'release/0.16' into wdtk
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cbdffc441..161a82b26 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -138,7 +138,9 @@ class ApplicationController < ActionController::Base backtrace = Rails.backtrace_cleaner.clean(exception.backtrace, :silent) message << " " << backtrace.join("\n ") Rails.logger.fatal("#{message}\n\n") - ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver + if !AlaveteliConfiguration.exception_notifications_from.blank? && !AlaveteliConfiguration.exception_notifications_to.blank? + ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver + end @status = 500 end respond_to do |format| |