X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ee5735d55068b035b83214d771af4cfaac3239bd..ba87362e7fe237c00df01967e02d182c15039f5d:/config/initializers/abstract_adapter.rb diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb index 5cc24d25c..9d59656c7 100644 --- a/config/initializers/abstract_adapter.rb +++ b/config/initializers/abstract_adapter.rb @@ -1,26 +1,17 @@ -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 +if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter) + 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 + super 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 end end end + + ActiveRecord::ConnectionAdaptors::AbstractAdapter.prepend(OpenStreetMap::AbstractAdapter::PropagateTimeouts) end