webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hddstatus auf der Media CGI nochmal ueberarbeitet

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@796 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-08-21 17:11:33 +00:00
parent 149a26a831
commit 3bc32eab4a
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
html/cgi-bin/media.cgi
View File

@@ -173,6 +173,8 @@ END
sub diskbox {
my $disk = $_[0];
chomp $disk;
my @status;
if (-e "$Header::graphdir/disk-$disk-day.png") {
&Header::openbox('100%', 'center', "Disk /dev/$disk $Lang::tr{'graph'}");
my $ftime = localtime((stat("$Header::graphdir/disk-$disk-day.png"))[9]);
@@ -181,9 +183,24 @@ sub diskbox {
print "<img alt='' src='/graphs/disk-$disk-day.png' border='0' />";
print "</a>";
print "<br />\n";
if (-e "/usr/local/bin/hddshutdown") {
system("/usr/local/bin/hddshutdown state $disk");
}
if (-e "/tmp/hddstatus") {
open(DATEI, "</tmp/hddstatus") || die "Datei nicht gefunden";
my @diskstate = <DATEI>;
close(DATEI);
foreach (@diskstate){
if ( $_ =~/$disk/ ){@status = split(/-/,$_);}
}
if ( $status[1]=~/standby/){
my $ftime = localtime((stat("/tmp/hddshutdown-$disk"))[9]);
print"<B>Disk /dev/$disk status:<font color=#FF0000>".$status[1]."</font></B> (since $ftime)";
}
else{
print"<B>Disk /dev/$disk status:<font color=#00FF00>".$status[1]."</font></B>";
}
}
my $smart = `/usr/local/bin/smartctrl $disk`;
$smart = &Header::cleanhtml($smart);
print <<END

16
src/scripts/hddshutdown
View File

@@ -12,23 +12,10 @@
my @proc = `cat /proc/diskstats`;
my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
my %diskstatus = "";
my %diskstate = "";
my $debug = 1;
my $status = "unknown";
if ( @ARGV[0] eq "state" ){
my $hdd = @ARGV[1];
$status = `hdparm -C /dev/$hdd | tail -1 | cut -d: -f2`;
if ( $status=~/standby/){
my $ftime = localtime((stat("/tmp/hddshutdown-$hdd"))[9]);
print"<B>Disk $hdd status: <font color=#00FF00>standby</font></B> (since $ftime)";
}
else{
print"<B>Disk $hdd status: <font color=#FF0000>active</font></B>";
}
exit;
}
if ($debug){print "### Reading Diskstats ###\n";}
foreach (@proc){
@@ -54,4 +41,5 @@ $status = `hdparm -C /dev/$_ | tail -1 | cut -d: -f2`;
if ( -e "/tmp/hddshutdown-$_" ) { system("unlink /tmp/hddshutdown-$_"); }
}
}
# end

9
src/scripts/makegraphs
View File

@@ -415,7 +415,6 @@ sub updatehdddata
$ERROR = RRDs::error;
print "Error in RRD::create for hdd-$disk: $ERROR\n" if $ERROR;
}
$temp = 0;
my $hdd_output = '';
my $smart_output = '';
@@ -564,14 +563,22 @@ updatememdata();
### HDD graphs
###
my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
system("unlink /tmp/hddstatus && touch /tmp/hddstatus");
print "\nFound following amount of disks:".@disks."\n";
foreach (@disks){
my $disk = $_;
chomp $disk;
print "Working on disk ".$disk.".\n";
updatediskdata($disk);
updatehdddata($disk);
my $status = `hdparm -C /dev/$disk | tail -1 | cut -d: -f2`;
open(DATEI, ">>/tmp/hddstatus") || die "Datei nicht gefunden";
print DATEI $disk."-".$status;
close(DATEI);
}
###