michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Take all files into account when tailing, but only read needed files

Browse Source
This commit is contained in:
Jamie Cameron
2012-01-23 11:39:51 -08:00
parent 73f25ae3af
commit 892b089adc
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
syslog/save_log.cgi
View File

@@ -90,7 +90,7 @@ elsif ($in{'view'}) {
@cats = ( "cat ".quotemeta($file) );
}
$cat = "(".join(" ; ", @cats).")";
$got = &foreign_call("proc", "safe_process_exec",
$got = &proc::safe_process_exec(
"$cat | grep -i $filter | $tailcmd",
0, 0, STDOUT, undef, 1, 0, undef, 1);
} else {
@@ -100,25 +100,28 @@ elsif ($in{'view'}) {
$fullcmd = $cmd." | ".$tailcmd;
}
elsif ($config{'compressed'}) {
# Find the first non-empty file, newest first
$catter = "cat ".quotemeta($file);
if (!-s $file) {
foreach $l (reverse(&all_log_files($file))) {
next if (!-s $l);
$c = &catter_command($l);
if ($c) {
$catter = $c;
last;
}
# Cat all compressed files
local @cats;
$total = 0;
foreach $l (reverse(&all_log_files($file))) {
next if (!-s $l);
$c = &catter_command($l);
if ($c) {
$len = int(&backquote_command(
"$c | wc -l"));
$total += $len;
push(@cats, $c);
last if ($total > $in{'lines'});
}
}
$fullcmd = $catter." | ".$tailcmd;
$cat = "(".join(" ; ", reverse(@cats)).")";
$fullcmd = $cat." | ".$tailcmd;
}
else {
# Just run tail on the file
$fullcmd = $tailcmd." ".quotemeta($file);
}
$got = &foreign_call("proc", "safe_process_exec",
$got = &proc::safe_process_exec(
$fullcmd, 0, 0, STDOUT, undef, 1, 0, undef, 1);
}
print "<i>$text{'view_empty'}</i>\n" if (!$got);