X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ee5735d55068b035b83214d771af4cfaac3239bd..c7391595d82f5255d400816eb0fe80b1c213d2e3:/config/initializers/abstract_adapter.rb

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 5cc24d25c..6bb5d10c0 100644
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -1,25 +1,20 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractAdapter
-    protected
-      alias_method :old_log, :log
+if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter)
+  module ActiveRecord
+    module ConnectionAdapters
+      class AbstractAdapter
+        protected
 
-      def log(sql, name)
-        if block_given?
-          old_log(sql, name) do
-            yield
+        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
+            translate_exception_class_without_timeout(e, sql)
           end
-        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
         end
+
+        alias_method_chain :translate_exception_class, :timeout
       end
     end
   end