mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed to detect if a device name defined in 'disk' doesn't exist in the system

This commit is contained in:
Jordi Sanfeliu 2013-02-20 15:21:37 +01:00
parent b5f05bf5ef
commit a4b8372901
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/disk.pm
View File

@ -33,6 +33,21 @@ sub disk_init {
my $rrd = $config->{base_lib} . $package . ".rrd";
my $disk = $config->{disk};
foreach my $k (sort keys %{$disk->{list}}) {
# values delimitted by ", " (comma + space)
my @dsk = split(', ', $disk->{list}->{$k});
for(my $n = 0; $n < 8; $n++) {
if($dsk[$n]) {
my $d = trim($dsk[$n]);
$d =~ s/^\"//;
$d =~ s/\"$//;
next if -e $d;
logger("ERROR: $myself: invalid or inexistent device name '$d'.");
return;
}
}
}
my $info;
my @ds;
my @tmp;
@ -168,7 +183,14 @@ sub disk_update {
}
}
close(IN);
$temp = `hddtemp -wqn $d` unless $temp;
if(!$temp) {
if(open(IN, "hddtemp -wqn $d |")) {
$temp = <IN>;
close(IN);
} else {
logger("$myself: 'smartctl' failed to get data from '$d' and 'hddtemp' seems doesn't exist.");
}
}
chomp($temp);
}
$rrdata .= ":$temp";