TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Allow connect_timeout, read_timeout and write_timeout settings for MySQL [#2544 state:resolved]

Browse Source 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
This commit is contained in:
Matt Conway 2009-04-22 22:25:46 -04:00 committed by Pratik Naik
parent 076ca48bd6
commit 1c9b3aabdd
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
View File

@ -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