Merge remote-tracking branch 'upstream/pull/1950'

[rails.git] / config / initializers / abstract_adapter.rb

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 6bb5d10c01bcafcecf142d36fc1c8ce27543d5bd..2bc4f5e59d40d07f552d36417bd3f211eda8d6ee 100644 (file)
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -1,21 +1,17 @@
 if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter)
 if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter)

-  module ActiveRecord
-    module ConnectionAdapters
-      class AbstractAdapter
-        protected
-
-        alias old_log log
-
-        def translate_exception_class_with_timeout(e, sql)
+  module OpenStreetMap
+    module AbstractAdapter
+      module PropagateTimeouts
+        def translate_exception_class(e, sql)

           if e.is_a?(Timeout::Error) || e.is_a?(OSM::APITimeoutError)
             e
           else
           if e.is_a?(Timeout::Error) || e.is_a?(OSM::APITimeoutError)
             e
           else

-            translate_exception_class_without_timeout(e, sql)
+            super(e, sql)

           end
         end
           end
         end

-
-        alias_method_chain :translate_exception_class, :timeout

       end
     end
   end
       end
     end
   end

+
+  ActiveRecord::ConnectionAdaptors::AbstractAdapter.prepend(OpenStreetMap::AbstractAdapter::PropagateTimeouts)

 end
 end