feature: configurable mysql connection timeouts

abak-press · Sep 22, 2015 · ec3baef · ec3baef
1 parent 07d726c
commit ec3baef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -84,6 +84,8 @@ production:
   searchd_file_path: data
   binlog_path: binlog
   log_level: warn
+  mysql_connect_timeout: 2
+  mysql_read_timeout: 5
 ```
 
 ### production with replication
@@ -113,6 +115,8 @@ production:
   agent_connect_timeout: 50
   ha_strategy: nodeads
   log_level: warn
+  mysql_connect_timeout: 2
+  mysql_read_timeout: 5
 
   user: sphinx
   remote_path: /home/index/master

diff --git a/lib/sphinx/integration/mysql/connection_pool.rb b/lib/sphinx/integration/mysql/connection_pool.rb
@@ -100,8 +100,8 @@ def options_for_connection(host, port)
         host: host_prepared(host),
         port: port_prepared(port),
         reconnect: true,
-        read_timeout: 2,
-        connect_timeout: 2
+        read_timeout: ::ThinkingSphinx::Configuration.instance.mysql_read_timeout,
+        connect_timeout: ::ThinkingSphinx::Configuration.instance.mysql_connect_timeout
       }
     end