mirror/librenms-librenms-agent
1
0
Fork 0
mirror of https://github.com/librenms/librenms-agent.git synced 2024-05-09 09:54:52 +00:00
Code Releases Activity

Merge pull request #223 from bestlong/master

Browse Source 
remove duplicate code #223
This commit is contained in:
VVelox
2019-05-06 03:35:15 -05:00
committed by GitHub
parent 1dacd20d50 8114d88f91
commit 459f56833b
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
agent-local/mysql
View File

@@ -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());

11
snmp/mysql
View File

@@ -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());