From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 Dec 2010 16:25:01 +0000 (+0000)
Subject: Channel all error reporting through report_error
X-Git-Tag: live~6303^2^2~47
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3472c1d4293ffa472d0f0d96b2773b3c59d79147

Channel all error reporting through report_error
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6c32b74b2..f9a5f88e1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -134,8 +134,7 @@ class ApplicationController < ActionController::Base
 
   def check_api_readable
     if STATUS == :database_offline or STATUS == :api_offline
-      response.headers['Error'] = "Database offline for maintenance"
-      render :nothing => true, :status => :service_unavailable
+      report_error "Database offline for maintenance", :service_unavailable
       return false
     end
   end
@@ -143,16 +142,14 @@ class ApplicationController < ActionController::Base
   def check_api_writable
     if STATUS == :database_offline or STATUS == :database_readonly or
        STATUS == :api_offline or STATUS == :api_readonly
-      response.headers['Error'] = "Database offline for maintenance"
-      render :nothing => true, :status => :service_unavailable
+      report_error "Database offline for maintenance", :service_unavailable
       return false
     end
   end
 
   def require_public_data
     unless @user.data_public?
-      response.headers['Error'] = "You must make your edits public to upload new data"
-      render :nothing => true, :status => :forbidden
+      report_error "You must make your edits public to upload new data", :forbidden
       return false
     end
   end