From 8559009dc832e65aab539b891308c6c9a33c6deb Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 2 Jun 2014 17:07:17 +0200 Subject: -ld: Print "no {host/service} downtimes" instead of an empty list --- bin/icli | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/bin/icli b/bin/icli index 9bfa94a..65ea86d 100755 --- a/bin/icli +++ b/bin/icli @@ -1120,28 +1120,38 @@ elsif ( $list_type eq 'q' ) { display_queue(); } elsif ( $list_type eq 'd' ) { - say "Host downtimes:"; - if ( $verbosity == 1 ) { - printf( "%-25.25s %-20.20s %-20.20s\n", 'Host', 'start', 'stop' ); - } - elsif ( $verbosity == 2 ) { - printf( "%-25.25s %-20.20s %-20.20s %-17.17s %s\n", - 'Host', 'start', 'stop', 'duration', 'comment' ); - } - foreach my $downtime ( @{ $data->{hostdowntimes} } ) { - display_downtime($downtime); + if ( @{ $data->{hostdowntimes} } ) { + say "Host downtimes:"; + if ( $verbosity == 1 ) { + printf( "%-25.25s %-20.20s %-20.20s\n", 'Host', 'start', 'stop' ); + } + elsif ( $verbosity == 2 ) { + printf( "%-25.25s %-20.20s %-20.20s %-17.17s %s\n", + 'Host', 'start', 'stop', 'duration', 'comment' ); + } + foreach my $downtime ( @{ $data->{hostdowntimes} } ) { + display_downtime($downtime); + } } - say "\nService downtimes:"; - if ( $verbosity == 1 ) { - printf( "%-25.25s %-25.25s %-20.20s %-20.20s\n", - 'Host', 'Service', 'start', 'stop' ); + else { + say "No host downtimes"; } - elsif ( $verbosity == 2 ) { - printf( "%-25.25s %-25.25s %-20.20s %-20.20s %-17.17s %s\n", - 'Host', 'Service', 'start', 'stop', 'duration', 'comment' ); + if ( @{ $data->{servicedowntimes} } ) { + say "\nService downtimes:"; + if ( $verbosity == 1 ) { + printf( "%-25.25s %-25.25s %-20.20s %-20.20s\n", + 'Host', 'Service', 'start', 'stop' ); + } + elsif ( $verbosity == 2 ) { + printf( "%-25.25s %-25.25s %-20.20s %-20.20s %-17.17s %s\n", + 'Host', 'Service', 'start', 'stop', 'duration', 'comment' ); + } + foreach my $downtime ( @{ $data->{servicedowntimes} } ) { + display_downtime($downtime); + } } - foreach my $downtime ( @{ $data->{servicedowntimes} } ) { - display_downtime($downtime); + else { + say "\nNo service downtimes"; } } elsif ($action) { -- cgit v1.2.3