Skip to content

Expand --count option #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tgreenx merged 4 commits into from
Jun 4, 2025
Merged

Expand --count option #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1167e74
Expand --count option
tgreenx Feb 25, 2025
4701c9c
Update --count option
tgreenx Apr 24, 2025
9d8ace6
Also update json output of --count option
tgreenx Apr 24, 2025
5ee387e
Update unit test for --count option
tgreenx Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 39 additions & 4 deletions lib/Zonemaster/CLI.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,17 +665,52 @@ sub run {
my $json_output = {};

if ( $opt_count ) {
my %entries;
foreach my $e ( @{ Zonemaster::Engine->logger->entries } ) {
$entries{$e->level}{$e->tag} += 1;
}

if ( $opt_json ) {
$json_output->{count} = {};
foreach my $level ( sort { $numeric{$b} <=> $numeric{$a} } keys %counter ) {
$json_output->{count}{$level} = $counter{$level};
$json_output->{count}{by_level}{$level} = $counter{$level};
}

foreach my $level ( sort { $numeric{$b} <=> $numeric{$a} } keys %entries ) {
foreach my $tag ( sort keys %{ $entries{$level} } ) {
$json_output->{count}{by_message_tag}{$level}{$tag} = $entries{$level}{$tag};
}
}
}
else {
say __( "\n\n Level\tNumber of log entries" );
say " =====\t=====================";
my $header1 = __( 'Level' );
my $max1 = length $header1;
my $header2 = __( 'Number of log entries' );
my $max2 = length $header2;

foreach my $level ( sort { $numeric{$b} <=> $numeric{$a} } keys %counter ) {
my $len = length translate_severity( $level );
$max1 = $len if $len > $max1;
}

printf "\n\n%${max1}s\t%${max2}s", $header1, $header2;
printf "\n%s\t%s\n", '=' x $max1, '=' x $max2;

foreach my $level ( sort { $numeric{$b} <=> $numeric{$a} } keys %counter ) {
printf __( "%8s\t%5d entries.\n" ), translate_severity( $level ), $counter{$level};
printf "%${max1}s\t%${max2}d\n", translate_severity( $level ), $counter{$level};
}

my $header3 = __( 'Message tag' );
my $max3 = max map { length "$_" } ( ( map { keys %{ $_ } } ( values %entries ) ), $header3 );
my $header4 = __( 'Count' );
my $max4 = max map { length "$_" } ( ( map { values %{ $_ } } ( values %entries ) ), $header4 );

printf "\n%${max1}s\t%${max3}s\t%${max4}s", $header1, $header3, $header4;
printf "\n%${max1}s\t%${max3}s\t%${max4}s\n", '=' x $max1, '=' x $max3, '=' x $max4;
foreach my $level ( sort { $numeric{$b} <=> $numeric{$a} } keys %entries ) {
foreach my $tag ( sort keys %{ $entries{$level} } ) {
printf "%${max1}s\t%${max3}s\t%${max4}s\n", $level, $tag, $entries{$level}{$tag};
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion script/zonemaster-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ Print the name of the test case (test case identifier) which produced the messag
=item B<--[no-]count>

Print a summary, at the end of a run, of the numbers of messages for each severity
level that were logged during the run.
level that were logged during the run, as well as a count of each message tag.
(default: disabled)

=item B<--[no-]nstimes>
Expand Down
5 changes: 5 additions & 0 deletions t/usage.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,11 @@ do {
INFO \s+ \d+
.*
DEBUG \s+ \d+
.*
Level \s+ \QMessage tag\E \s+ \QCount\E
.*
INFO \s+ \w+ \s+ \d+
.*
}msx,
json => {
type => "object",
Expand Down