X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8af14faa49deed681fa835dd6bd3f77316b44a55..a520f1251cf06be665d93037c74116a9f769fbf1:/config/initializers/abstract_adapter.rb

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 9042823c2..6bb5d10c0 100644
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -1,27 +1,20 @@
-if defined?(ActionRecord::ConnectionAdaptors::AbstractAdaptor)
+if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter)
   module ActiveRecord
     module ConnectionAdapters
       class AbstractAdapter
-      protected
-        alias_method :old_log, :log
-  
-        def log(sql, name)
-          if block_given?
-            old_log(sql, name) do
-              yield
-            end
+        protected
+
+        alias old_log log
+
+        def translate_exception_class_with_timeout(e, sql)
+          if e.is_a?(Timeout::Error) || e.is_a?(OSM::APITimeoutError)
+            e
           else
-            old_log(sql, name)
-          end
-        rescue ActiveRecord::StatementInvalid => ex
-          if ex.message =~ /^OSM::APITimeoutError: /
-            raise OSM::APITimeoutError.new
-          elsif ex.message =~ /^Timeout::Error: /
-            raise Timeout::Error.new("time's up!")
-          else
-            raise
+            translate_exception_class_without_timeout(e, sql)
           end
         end
+
+        alias_method_chain :translate_exception_class, :timeout
       end
     end
   end