cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Respond to timeouts with a server error code

Browse source
This commit is contained in:
Anton Khorev 2024-09-09 19:13:29 +03:00
parent 51e0cf85b0
commit e272a384ce
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/application_controller.rb
View file

@ -224,14 +224,17 @@ class ApplicationController < ActionController::Base
if e.is_a?(Timeout::Error) || if e.is_a?(Timeout::Error) ||
(e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired")) (e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired"))
ActiveRecord::Base.connection.raw_connection.cancel respond_to_timeout
render :action => "timeout"
else else
raise raise
end end
rescue Timeout::Error rescue Timeout::Error
respond_to_timeout
end
def respond_to_timeout
ActiveRecord::Base.connection.raw_connection.cancel ActiveRecord::Base.connection.raw_connection.cancel
render :action => "timeout" render :action => "timeout", :status => :gateway_timeout
end end
## ##