From 5bb8cc851fe203c28df0e78acafbc5ed755c2fa9 Mon Sep 17 00:00:00 2001 From: Denis Zheleztsov Date: Fri, 17 Jul 2015 16:04:12 +0300 Subject: [PATCH] Mailer fix --- handlers/mailer.pl | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/handlers/mailer.pl b/handlers/mailer.pl index 82d5d5f..7dda37f 100755 --- a/handlers/mailer.pl +++ b/handlers/mailer.pl @@ -98,13 +98,15 @@ sub get_previous_status { my $check_run_file = '/etc/sensu/handlers/run/' . $check_name; my $previous_check_status; - open my $run, '<', $check_run_file or warn "Cannot open file: $!\n"; - if ($run) { + if ( -e $check_run_file ) { + open my $run, '<', $check_run_file or warn "Cannot open file: $!\n"; while (<$run>) { $previous_check_status = $_; } close($run); + write_status( $check_name, $status ); + return $previous_check_status; } @@ -118,20 +120,13 @@ sub get_previous_status { # Check status sub status_change { - my ($message) = @_; - - my $check_name = $message->{check}->{name}; - - # Current check status my $current_check_status = $message->{check}->{status}; # Get provious check status my $previous_check_status = get_previous_status( $check_name, $current_check_status ); - if ( ( $previous_check_status == -1 ) - or ( $previous_check_status eq $current_check_status ) ) - { + if ( $previous_check_status == $current_check_status ) { return -1; } else { @@ -145,6 +140,9 @@ if ( status_change == 0 ) { `cat $mail_file | $mail_cmd -v -s "'$mail_subg'" $mail_to`; } +else { + print "Status not changes\n"; +} # Remove temp file my @rm_cmd = ( 'rm', '-f', $mail_file );