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

Attempt to make timeouts work properly

Browse source
This commit is contained in:
Tom Hughes 2024-01-29 19:37:59 +00:00
parent 65f22b0663
commit 24f579562f
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api_controller.rb
View file

@ -177,7 +177,7 @@ class ApiController < ApplicationController
##
# wrap an api call in a timeout
def api_call_timeout(&block)
Timeout.timeout(Settings.api_timeout, Timeout::Error, &block)
Timeout.timeout(Settings.api_timeout, &block)
rescue ActionView::Template::Error => e
e = e.cause

2
app/controllers/application_controller.rb
View file

@ -199,7 +199,7 @@ class ApplicationController < ActionController::Base
##
# wrap a web page in a timeout
def web_timeout(&block)
Timeout.timeout(Settings.web_timeout, Timeout::Error, &block)
Timeout.timeout(Settings.web_timeout, &block)
rescue ActionView::Template::Error => e
e = e.cause