diff --git a/agent-local/mysql b/agent-local/mysql index 3b8b304..9277efc 100755 --- a/agent-local/mysql +++ b/agent-local/mysql @@ -349,17 +349,12 @@ function ss_get_mysql_stats( $options ) { debug("PHP MySQLi extension is not loaded"); die("PHP MySQLi extension is not loaded"); } + $conn = mysqli_init(); + $conn->options(MYSQLI_OPT_CONNECT_TIMEOUT, $connection_timeout); if ( $mysql_ssl ) { - $conn = mysqli_init(); - $conn->options(MYSQLI_OPT_CONNECT_TIMEOUT, $connection_timeout); mysqli_ssl_set($conn, $mysql_ssl_key, $mysql_ssl_cert, $mysql_ssl_ca, NULL, NULL); - mysqli_real_connect($conn, $host, $user, $pass, NULL, $port, $socket, $flags); - } - else { - $conn = mysqli_init(); - $conn->options(MYSQLI_OPT_CONNECT_TIMEOUT, $connection_timeout); - mysqli_real_connect($conn, $host, $user, $pass, NULL, $port, $socket, $flags); } + @mysqli_real_connect($conn, $host, $user, $pass, NULL, $port, $socket, $flags); if ( mysqli_connect_errno() ) { debug("MySQL connection failed: " . mysqli_connect_error()); die("ERROR: " . mysqli_connect_error()); diff --git a/snmp/mysql b/snmp/mysql index e08ed6a..27833e0 100755 --- a/snmp/mysql +++ b/snmp/mysql @@ -352,17 +352,12 @@ function ss_get_mysql_stats( $options ) { debug("PHP MySQLi extension is not loaded"); die("PHP MySQLi extension is not loaded"); } + $conn = mysqli_init(); + $conn->options(MYSQLI_OPT_CONNECT_TIMEOUT, $connection_timeout); if ( $mysql_ssl ) { - $conn = mysqli_init(); - $conn->options(MYSQLI_OPT_CONNECT_TIMEOUT, $connection_timeout); mysqli_ssl_set($conn, $mysql_ssl_key, $mysql_ssl_cert, $mysql_ssl_ca, NULL, NULL); - mysqli_real_connect($conn, $host, $user, $pass, NULL, $port, $socket, $flags); - } - else { - $conn = mysqli_init(); - $conn->options(MYSQLI_OPT_CONNECT_TIMEOUT, $connection_timeout); - mysqli_real_connect($conn, $host, $user, $pass, NULL, $port, $socket, $flags); } + @mysqli_real_connect($conn, $host, $user, $pass, NULL, $port, $socket, $flags); if ( mysqli_connect_errno() ) { debug("MySQL connection failed: " . mysqli_connect_error()); die("ERROR: " . mysqli_connect_error());