From 474a42cfbd939f644eb5d900e447dae48142508a Mon Sep 17 00:00:00 2001 From: Ariejan de Vroom Date: Tue, 27 Mar 2012 16:59:25 +0300 Subject: [PATCH] Only load MySQL2Adapter connection fix is MySQL2 is available. --- config/initializers/connection_fix.rb | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/config/initializers/connection_fix.rb b/config/initializers/connection_fix.rb index d15b0c2..c29f6b1 100644 --- a/config/initializers/connection_fix.rb +++ b/config/initializers/connection_fix.rb @@ -1,16 +1,18 @@ -module ActiveRecord::ConnectionAdapters - class Mysql2Adapter - alias_method :execute_without_retry, :execute +if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) + module ActiveRecord::ConnectionAdapters + class Mysql2Adapter + alias_method :execute_without_retry, :execute - def execute(*args) - execute_without_retry(*args) - rescue Mysql2::Error => e - if e.message =~ /server has gone away/i - warn "Server timed out, retrying" - reconnect! - retry - else - raise e + def execute(*args) + execute_without_retry(*args) + rescue Mysql2::Error => e + if e.message =~ /server has gone away/i + warn "Server timed out, retrying" + reconnect! + retry + else + raise e + end end end end -- libgit2 0.21.2