Merge pull request #9621 from Fryguy/fix_ping_controller

Better PingController errors

Author: jrafanie

app/controllers/ping_controller.rb

@@ -1,14 +1,14 @@
 class PingController < ApplicationController
   def index
-    raise PG::Error unless ActiveRecord::Base.connectable?
+    ActiveRecord::Base.connectable!
 
     render :plain => 'pong', :status => 200
   end
 
   private def error_handler(e)
     message =
       case e
-      when PG::Error
+      when *ActiveRecord::Base::CONNECTIVITY_ERRORS
         "Unable to connect to the database"
       else
         "Unknown"

spec/controllers/ping_controller_spec.rb

@@ -9,16 +9,16 @@
   end
 
   it 'fails gracefully with database errors' do
-    expect(ActiveRecord::Base).to receive(:connectable?).and_return(false)
+    expect(ActiveRecord::Base).to receive(:connectable!).and_raise(PG::ConnectionBad)
 
     get :index
 
     expect(response.status).to eq(500)
-    expect(response.body).to eq("ERROR: Unable to connect to the database (PG::Error)")
+    expect(response.body).to eq("ERROR: Unable to connect to the database (PG::ConnectionBad)")
   end
 
   it 'fails gracefully with non-database errors' do
-    expect(ActiveRecord::Base).to receive(:connectable?).and_raise(RuntimeError)
+    expect(ActiveRecord::Base).to receive(:connectable!).and_raise(RuntimeError)
 
     get :index