hhf/MySQLTuner-perl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding get_http_cli for curl or wget detecting in sysstat

Browse source
This commit is contained in:
Jean-Marie RENOUARDjmrenouard@gmail.com 2016-04-05 09:49:43 -04:00
parent 89ade050a7
commit 97cce402ae
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
mysqltuner.pl
View file

@ -418,6 +418,20 @@ sub os_setup {
} }
sub get_http_cli {
my $httpcli = `which curl`;
chomp($httpcli);
if ( defined($httpcli) and -e "$httpcli" ) {
return $httpcli;
}
$httpcli = `which wget`;
chomp($httpcli);
if ( defined($httpcli) and -e "$httpcli" ) {
return $httpcli;
}
return "";
}
# Checks for updates to MySQLTuner # Checks for updates to MySQLTuner
sub validate_tuner_version { sub validate_tuner_version {
if ( $opt{'checkversion'} eq 0 and $opt{'updateversion'} eq 0 ) { if ( $opt{'checkversion'} eq 0 and $opt{'updateversion'} eq 0 ) {
@ -443,6 +457,8 @@ sub validate_tuner_version {
compare_tuner_version($update); compare_tuner_version($update);
return; return;
} else {
} }
$httpcli = `which wget`; $httpcli = `which wget`;
@ -1210,7 +1226,7 @@ sub get_system_info() {
infoprint "Machine type : Physical machine"; infoprint "Machine type : Physical machine";
} }
`ping -c 1 google.com &>/dev/null`; `ping -c 1 ipecho.net &>/dev/null`;
my $isConnected = $?; my $isConnected = $?;
if ( $? == 0 ) { if ( $? == 0 ) {
infoprint "Internet : Connected"; infoprint "Internet : Connected";
@ -1224,12 +1240,12 @@ sub get_system_info() {
infoprint "Network Cards : "; infoprint "Network Cards : ";
infocmd_tab "ifconfig| grep -A1 mtu"; infocmd_tab "ifconfig| grep -A1 mtu";
infoprint "Internal IP : " . infocmd_one "hostname -I"; infoprint "Internal IP : " . infocmd_one "hostname -I";
my $httpcli=get_http_cli();
infoprint "HTTP client found: $httpcli" if defined $httpcli;
infoprint "External IP : " infoprint "External IP : "
. infocmd_one "curl -s ipecho.net/plain" . infocmd_one "$httpcli ipecho.net/plain" if defined ($httpcli);
if $isConnected == 0;
badprint badprint
"External IP : Can't check because of Internet connectivity" "External IP : Can't check because of Internet connectivity" unless defined($httpcli);
if $isConnected != 0;
infoprint "Name Servers : " infoprint "Name Servers : "
. infocmd_one "grep 'nameserver' /etc/resolv.conf \| awk '{print \$2}'"; . infocmd_one "grep 'nameserver' /etc/resolv.conf \| awk '{print \$2}'";
infoprint "Logged In users : "; infoprint "Logged In users : ";