summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjcredding <TempestTTU@gmail.com>2012-06-11 15:06:17 -0500
committerjcredding <TempestTTU@gmail.com>2012-06-11 15:58:58 -0500
commit294dfe15ca4002ff2c6c6f2e83e59e042ac973ba (patch)
tree2b0ac204505a2e153eca29f32be40c067b8b615d
parentb5fdacd153977748f16439689487be35c3699e9b (diff)
downloadgitlab-ce-294dfe15ca4002ff2c6c6f2e83e59e042ac973ba.tar.gz
added connection fix initializer, helps long running resque workers not fail
-rw-r--r--config/initializers/connection_fix.rb21
1 files changed, 19 insertions, 2 deletions
diff --git a/config/initializers/connection_fix.rb b/config/initializers/connection_fix.rb
index c29f6b11177..16cb69ca68b 100644
--- a/config/initializers/connection_fix.rb
+++ b/config/initializers/connection_fix.rb
@@ -1,11 +1,26 @@
+# from http://gist.github.com/238999
+#
+# If your workers are inactive for a long period of time, they'll lose
+# their MySQL connection.
+#
+# This hack ensures we re-connect whenever a connection is
+# lost. Because, really. why not?
+#
+# Stick this in RAILS_ROOT/config/initializers/connection_fix.rb (or somewhere similar)
+#
+# From:
+# http://coderrr.wordpress.com/2009/01/08/activerecord-threading-issues-and-resolutions/
+
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
+ rescue ActiveRecord::StatementInvalid => e
if e.message =~ /server has gone away/i
warn "Server timed out, retrying"
reconnect!
@@ -15,5 +30,7 @@ if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
end
end
end
+
end
-end \ No newline at end of file
+
+end