Merge pull request #195 from kkmuffme/fix-server-selection-tcp-responsiveness-disabled

Fix that if check_tcp_responsiveness is disabled, time is wasted by looping over all possible servers while the last one is used instead of the first possible one

Author: JJJ

ludicrousdb/includes/class-ludicrousdb.php

@@ -1052,10 +1052,7 @@ public function db_connect( $query = '' ) {
 
 				$this->timer_start();
 
-				// Maybe check TCP responsiveness
-				$tcp = ! empty( $this->check_tcp_responsiveness )
-					? $this->check_tcp_responsiveness( $host, $port, $timeout )
-					: null;
+				$tcp = $this->check_tcp_responsiveness( $host, $port, $timeout );
 
 				// Connect if necessary or possible
 				if (
@@ -1272,6 +1269,7 @@ protected function increment_db_connection( $connection = 0, $name = '' ) {
 	 * @return bool|mysqli|resource
 	 */
 	protected function single_db_connect( $dbhname, $host, $user, $password ) {
+		$tcp_cache_key = $host;
 		$this->is_mysql = true;
 
 		// Check client flags
@@ -1338,6 +1336,8 @@ protected function single_db_connect( $dbhname, $host, $user, $password ) {
 		if ( ! empty( $this->dbhs[ $dbhname ]->connect_errno ) ) {
 			$this->dbhs[ $dbhname ] = false;
 
+			$this->tcp_cache_set( $tcp_cache_key, 'down' );
+
 			return false;
 		}
 
@@ -2310,6 +2310,11 @@ public function check_tcp_responsiveness( $host, $port, $float_timeout ) {
 			return false;
 		}
 
+		if ( empty( $this->check_tcp_responsiveness ) ) {
+			$this->tcp_responsive = true;
+			return true;
+		}
+
 		// Defaults
 		$errno  = 0;
 		$errstr = '';
@@ -2324,6 +2329,7 @@ public function check_tcp_responsiveness( $host, $port, $float_timeout ) {
 		// No socket
 		if ( false === $socket ) {
 			$this->tcp_cache_set( $cache_key, 'down' );
+			$this->tcp_responsive = false;
 
 			return "[ > {$float_timeout} ] ({$errno}) '{$errstr}'";
 		}
@@ -2334,6 +2340,7 @@ public function check_tcp_responsiveness( $host, $port, $float_timeout ) {
 
 		// Using API
 		$this->tcp_cache_set( $cache_key, 'up' );
+		$this->tcp_responsive = true;
 
 		return true;
 	}