proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-27 10:01:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools: Add callback based filtering for logfile dump

Browse Source 
This patch introduces callback based filtering functionality for logfile dumps.
Further, the `dump_logfile` function is split into a reusable part for dumps
generated based on a filehandle. The state parameter can be used to keep the
state for multiple consecutive function invocations.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2023-01-11 14:32:20 +01:00 committed by Wolfgang Bumiller
parent 2e3fd24d1a
commit 12a0ec1888
1 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/PVE/Tools.pm
View File

@ -1265,29 +1265,25 @@ sub split_args {
return $str ? [ Text::ParseWords::shellwords($str) ] : []; return $str ? [ Text::ParseWords::shellwords($str) ] : [];
} }
sub dump_logfile { sub dump_logfile_by_filehandle {
my ($filename, $start, $limit, $filter) = @_; my ($fh, $filter, $state) = @_;
my $lines = []; my $count = ($state->{count} //= 0);
my $count = 0; my $lines = ($state->{lines} //= []);
my $start = ($state->{start} //= 0);
my $limit = ($state->{limit} //= 50);
my $final = ($state->{final} //= 1);
my $read_until_end = ($state->{read_until_end} //= $limit == 0);
my $fh = IO::File->new($filename, "r");
if (!$fh) {
$count++;
push @$lines, { n => $count, t => "unable to open file - $!"};
return ($count, $lines);
}
$start = $start // 0;
$limit = $limit // 50;
my $read_until_end = $limit == 0;
my $line; my $line;
if ($filter) { if ($filter) {
# duplicate code, so that we do not slow down normal path # duplicate code, so that we do not slow down normal path
while (defined($line = <$fh>)) { while (defined($line = <$fh>)) {
if (ref($filter) eq 'CODE') {
next if !$filter->($line);
} else {
next if $line !~ m/$filter/; next if $line !~ m/$filter/;
}
next if $count++ < $start; next if $count++ < $start;
if (!$read_until_end) { if (!$read_until_end) {
next if $limit <= 0; next if $limit <= 0;
@ -1308,16 +1304,37 @@ sub dump_logfile {
} }
} }
close($fh);
# HACK: ExtJS store.guaranteeRange() does not like empty array # HACK: ExtJS store.guaranteeRange() does not like empty array
# so we add a line # so we add a line
if (!$count) { if (!$count && $final) {
$count++; $count++;
push @$lines, { n => $count, t => "no content"}; push @$lines, { n => $count, t => "no content"};
} }
return ($count, $lines); $state->{count} = $count;
$state->{limit} = $limit;
}
sub dump_logfile {
my ($filename, $start, $limit, $filter) = @_;
my $fh = IO::File->new($filename, "r");
if (!$fh) {
return (1, { n => 1, t => "unable to open file - $!"});
}
my %state = (
'count' => 0,
'lines' => [],
'start' => $start,
'limit' => $limit,
);
dump_logfile_by_filehandle($fh, $filter, \%state);
close($fh);
return ($state{'count'}, $state{'lines'});
} }
sub dump_journal { sub dump_journal {