opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 04:46:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

logformatter: refactor verbose line-print

Browse Source 
Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2023-01-05 10:10:24 -07:00
parent 609df3ec32
commit ee3380e6b1
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
contrib/cirrus/logformatter
View File

@ -251,6 +251,19 @@ END_HTML
$previous_timestamp = $timestamp; $previous_timestamp = $timestamp;
} }
# Helper function for printing a formatted line. This should always
# be followed by 'next LINE'.
my $print_line = sub {
my $css = shift;
print { $out_fh } "<span class=\"timestamp\">$timestamp</span>"
if $timestamp;
print { $out_fh } "<span class='$css'>" if $css;
print { $out_fh } $line;
print { $out_fh } "</span>" if $css;
print { $out_fh } "\n";
};
# Try to identify the git commit we're working with... # Try to identify the git commit we're working with...
if ($line =~ m!/define.gitCommit=([0-9a-f]+)!) { if ($line =~ m!/define.gitCommit=([0-9a-f]+)!) {
$git_commit = $1; $git_commit = $1;
@ -305,9 +318,7 @@ END_HTML
if ($line =~ /^\s*(OK|FAILED)\s+\(/) { if ($line =~ /^\s*(OK|FAILED)\s+\(/) {
undef $looks_like_python; undef $looks_like_python;
my $css = ($1 eq 'OK' ? 'passed' : 'failed'); my $css = ($1 eq 'OK' ? 'passed' : 'failed');
print { $out_fh } "<span class=\"timestamp\">$timestamp</span>" $print_line->("bats-$css");
if $timestamp;
print { $out_fh } "<span class='bats-$css'>", $line, "</span>\n";
next LINE; next LINE;
} }
} }
@ -339,14 +350,11 @@ END_HTML
push @{$bats_count{__fail_list}}, [ $2, $3 ] if $1; push @{$bats_count{__fail_list}}, [ $2, $3 ] if $1;
} }
$line = "<span class='bats-$css'>$line</span>";
$bats_count{$css}++; $bats_count{$css}++;
$css = "bats-$css";
} }
print { $out_fh } "<span class=\"timestamp\">$timestamp</span>" $print_line->($css);
if $timestamp;
print { $out_fh } $line, "\n";
next LINE; next LINE;
} }
elsif ($looks_like_python) { elsif ($looks_like_python) {
@ -362,13 +370,10 @@ END_HTML
} }
if ($css) { if ($css) {
$line = "<span class='bats-$css'>$line</span>";
$bats_count{$css}++; $bats_count{$css}++;
$css = "bats-$css";
} }
print { $out_fh } "<span class=\"timestamp\">$timestamp</span>" $print_line->($css);
if $timestamp;
print { $out_fh } $line, "\n";
next LINE; next LINE;
} }