Cancel running queries when a timeout occurs

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2e7bc2f5957977b7faf4c9801f439d1e4f6803dc..240e46c31b9180a8d3a20bd2daf5d98f3c8b1849 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -60,7 +60,7 @@ Metrics/BlockNesting:
 # Offense count: 25
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 313
+  Max: 316
 
 # Offense count: 58
 # Configuration parameters: IgnoredMethods.

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1d68654055538fd597265043e2adcb52e3ceb94f..d3f57f0867f819a037b8ddbf581747ddb54f8530 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -231,6 +231,7 @@ class ApplicationController < ActionController::Base
   def api_call_timeout(&block)
     Timeout.timeout(Settings.api_timeout, Timeout::Error, &block)
   rescue Timeout::Error
+    ActiveRecord::Base.connection.raw_connection.cancel
     raise OSM::APITimeoutError
   end
 
@@ -243,11 +244,13 @@ class ApplicationController < ActionController::Base
 
     if e.is_a?(Timeout::Error) ||
        (e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired"))
+      ActiveRecord::Base.connection.raw_connection.cancel
       render :action => "timeout"
     else
       raise
     end
   rescue Timeout::Error
+    ActiveRecord::Base.connection.raw_connection.cancel
     render :action => "timeout"
   end