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

services.cgi: Fix wrong memory usage display.

Browse Source
This commit is contained in:
Michael Tremer
2012-07-19 22:12:05 +02:00
parent a786b755eb
commit 24c82ed212
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/61/filelists/files
View File

@@ -6,6 +6,7 @@ srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/services.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
var/ipfire/proxy/calamaris/bin/mkreport

17
html/cgi-bin/services.cgi
View File

@@ -240,7 +240,7 @@ sub isrunning{
my $pid = '';
my $testcmd = '';
my $exename;
my @memory;
my $memory;
$cmd =~ /(^[a-z]+)/;
$exename = $1;
@@ -256,13 +256,18 @@ sub isrunning{
}
close FILE;
}
if (open(FILE, "/proc/${pid}/statm")){
my $temp = <FILE>;
@memory = split(/ /,$temp);
if (open(FILE, "/proc/${pid}/status")) {
while (<FILE>) {
my ($key, $val) = split(":", $_, 2);
if ($key eq 'VmRSS') {
$memory = $val;
last;
}
}
close(FILE);
}
close FILE;
if ($testcmd =~ /$exename/){
$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory[0] KB</td>";
$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory</td>";
}
}
return $status;