X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/70bb55b35e35154bb36f43ef4ea64ccc1601bbc5..70190cf363583ea2941d21b7ea6e0a57608d9437:/config/initializers/abstract_adapter.rb?ds=sidebyside diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb index fbae428cb..f9b711f6c 100644 --- a/config/initializers/abstract_adapter.rb +++ b/config/initializers/abstract_adapter.rb @@ -1,24 +1,26 @@ -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 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 + 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 - 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 - else - raise end end end