Permalink
Browse files

Allow connect_timeout, read_timeout and write_timeout settings for My…

…SQL [#2544 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
  • Loading branch information...
1 parent 076ca48 commit 1c9b3aabdd1ff1e5b0e2b9bf6d5149baf6f23d1b Matt Conway committed with lifo Apr 23, 2009
Showing with 4 additions and 0 deletions.
  1. +4 −0 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
View
4 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -587,6 +587,10 @@ def connect
@connection.ssl_set(@config[:sslkey], @config[:sslcert], @config[:sslca], @config[:sslcapath], @config[:sslcipher])
end
+ @connection.options(Mysql::OPT_CONNECT_TIMEOUT, @config[:connect_timeout]) if @config[:connect_timeout]
+ @connection.options(Mysql::OPT_READ_TIMEOUT, @config[:read_timeout]) if @config[:read_timeout]
+ @connection.options(Mysql::OPT_WRITE_TIMEOUT, @config[:write_timeout]) if @config[:write_timeout]
+
@connection.real_connect(*@connection_options)
# reconnect must be set after real_connect is called, because real_connect sets it to false internally

0 comments on commit 1c9b3aa

Please sign in to comment.