Merge pull request #9619 from Fryguy/fix_ping_controller

Fix false negative in PingController after Rails 7.2

Author: jrafanie

app/controllers/ping_controller.rb

@@ -1,7 +1,20 @@
 class PingController < ApplicationController
   def index
-    raise PG::Error unless ActiveRecord::Base.connection.active?
+    raise PG::Error unless ActiveRecord::Base.connectable?
 
     render :plain => 'pong', :status => 200
   end
+
+  private def error_handler(e)
+    message =
+      case e
+      when PG::Error
+        "Unable to connect to the database"
+      else
+        "Unknown"
+      end
+    message = "ERROR: #{message} (#{e.class.name})"
+    Rails.logger.error("#{message} - #{e.message}")
+    render :plain => message, :status => 500
+  end
 end

spec/controllers/ping_controller_spec.rb

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