VladPolskiy/openstreetmap-website
1
0
Fork 0
mirror of https://github.com/openstreetmap/openstreetmap-website.git synced 2025-08-16 17:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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 # wrap an api call in a timeout
def api_call_timeout(&block) def api_call_timeout(&block)
Timeout.timeout(Settings.api_timeout, Timeout::Error, &block) Timeout.timeout(Settings.api_timeout, &block)
rescue ActionView::Template::Error => e rescue ActionView::Template::Error => e
e = e.cause 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 # wrap a web page in a timeout
def web_timeout(&block) def web_timeout(&block)
Timeout.timeout(Settings.web_timeout, Timeout::Error, &block) Timeout.timeout(Settings.web_timeout, &block)
rescue ActionView::Template::Error => e rescue ActionView::Template::Error => e
e = e.cause e = e.cause