make sure we always set wait_timeout even if a bad value was given

brianmario · Oct 19, 2010 · 7e75f5e · 7e75f5e
1 parent e7dcf37
commit 7e75f5e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/active_record/connection_adapters/mysql2_adapter.rb b/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -622,8 +622,9 @@ def configure_connection
           variable_assignments << "NAMES '#{encoding}'" if encoding
 
           # increase timeout so mysql server doesn't disconnect us
-          wait_timeout = @config[:wait_timeout] || 2592000
-          variable_assignments << "@@wait_timeout = #{wait_timeout}" if wait_timeout.is_a?(Fixnum)
+          wait_timeout = @config[:wait_timeout]
+          wait_timeout = 2592000 unless wait_timeout.is_a?(Fixnum)
+          variable_assignments << "@@wait_timeout = #{wait_timeout}"
 
           execute("SET #{variable_assignments.join(', ')}", :skip_logging)
         end