From 667c62e346fec618424c5d248e10b878e1fd5437 Mon Sep 17 00:00:00 2001 From: Matt West Date: Sat, 16 Mar 2013 10:01:44 +0000 Subject: [PATCH] Minor bugfixes --- plugins/memcached/memcached_multi_ | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/memcached/memcached_multi_ b/plugins/memcached/memcached_multi_ index 3f5dea38..b7bd5142 100755 --- a/plugins/memcached/memcached_multi_ +++ b/plugins/memcached/memcached_multi_ @@ -499,7 +499,7 @@ if (defined $ARGV[0] && $ARGV[0] eq 'suggest') { if (defined($s)) { fetch_stats(); my @rootplugins = ('bytes','conns','commands','evictions','items','memory'); - if ($stats{version} !~ /^1\.4\.[0-2]$/) { + if ($stats{version} !~ /^1\.4\.[0-7]$/) { push(@rootplugins, 'unfetched'); } foreach my $plugin (@rootplugins) { @@ -1012,7 +1012,7 @@ sub fetch_stats { # Lets print the stats command and store the info from the output print $s "stats\r\n"; while (my $line = <$s>) { - if ($line =~ /STAT\s(.+?)\s(.*)/) { + if ($line =~ /STAT\s(.+?)\s((\w|\d|\S)+)/) { my ($skey,$svalue) = ($1,$2); $stats{$skey} = $svalue; } @@ -1021,7 +1021,7 @@ sub fetch_stats { # Lets print the stats settings command and store the info from the output print $s "stats settings\r\n"; while (my $line = <$s>) { - if ($line =~ /STAT\s(.+?)\s(.*)/) { + if ($line =~ /STAT\s(.+?)\s((\w|\d|\S)+)/) { my ($skey,$svalue) = ($1,$2); if ($skey eq 'evictions') { $skey = 'evictions_active';