From d1d3c2597e81f64d908c5e0c797ccb1600722e88 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 7 Sep 2023 00:32:11 +0100 Subject: [PATCH] Handle timeouts inside a view for API calls --- app/controllers/api_controller.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index a2d016c8c..89388c0bb 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -178,6 +178,16 @@ class ApiController < ApplicationController # wrap an api call in a timeout def api_call_timeout(&block) Timeout.timeout(Settings.api_timeout, Timeout::Error, &block) + rescue ActionView::Template::Error => e + e = e.cause + + if e.is_a?(Timeout::Error) || + (e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired")) + ActiveRecord::Base.connection.raw_connection.cancel + raise OSM::APITimeoutError + else + raise + end rescue Timeout::Error ActiveRecord::Base.connection.raw_connection.cancel raise OSM::APITimeoutError -- 2.39.5