Merge branch '6553-ignore-invalid-mime-negotiation' into develop

mysociety · Oct 11, 2021 · 3d3a388 · 3d3a388
2 parents 37f9239 + 1b6eb8f
commit 3d3a388
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -124,13 +124,22 @@
     exception_notifier_prefix << "[#{ AlaveteliConfiguration.domain }] "
   end
 
-  if !AlaveteliConfiguration.exception_notifications_from.blank? && !AlaveteliConfiguration.exception_notifications_to.blank?
+  notify_exceptions =
+    AlaveteliConfiguration.exception_notifications_from.present? &&
+    AlaveteliConfiguration.exception_notifications_to.present?
+
+  if notify_exceptions
+    ignored_exceptions = %w(
+      ActionController::BadRequest
+      ActionDispatch::Http::MimeNegotiation::InvalidType
+    ) + ExceptionNotifier.ignored_exceptions
+
     middleware.use ExceptionNotification::Rack,
-      :ignore_exceptions => ['ActionController::BadRequest'] + ExceptionNotifier.ignored_exceptions,
-      :email => {
-        :email_prefix => exception_notifier_prefix,
-        :sender_address => AlaveteliConfiguration.exception_notifications_from,
-        :exception_recipients => AlaveteliConfiguration.exception_notifications_to
+      ignore_exceptions: ignored_exceptions,
+      email: {
+        email_prefix: exception_notifier_prefix,
+        sender_address: AlaveteliConfiguration.exception_notifications_from,
+        exception_recipients: AlaveteliConfiguration.exception_notifications_to
       }
   end