summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-09-29 05:17:37 +0000
committerStan Hu <stanhu@gmail.com>2016-09-29 05:17:37 +0000
commit53da820b7ccec481eb01e2cc8be05c4721206942 (patch)
tree959d50522110b5d1fa50e079c05469f5ca92b99b
parenta2c528f2a47d2b512875240ed5a6bef274314d71 (diff)
parent9469666623bd7d407cd02ed14273c826069bc65d (diff)
downloadgitlab-ce-53da820b7ccec481eb01e2cc8be05c4721206942.tar.gz
Merge branch 'mrchrisw/mysql-connection-warn' into 'master'
Update warn message for MySQL fix ZD: https://gitlab.zendesk.com/agent/tickets/39529 The current warn message is ambiguous. We should mention MySQL. See merge request !6582
-rw-r--r--config/initializers/connection_fix.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/connection_fix.rb b/config/initializers/connection_fix.rb
index d831a1838ed..d0b1444f607 100644
--- a/config/initializers/connection_fix.rb
+++ b/config/initializers/connection_fix.rb
@@ -20,7 +20,7 @@ if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
execute_without_retry(*args)
rescue ActiveRecord::StatementInvalid => e
if e.message =~ /server has gone away/i
- warn "Server timed out, retrying"
+ warn "Lost connection to MySQL server during query"
reconnect!
retry
else