Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

Send an email when a replication job fails.

Browse Source 
A email notification will be send for each job when the job fails.
This message will only send when an error occurs and the fail count is on 1.

Reviewed-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Acked-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Link 2017-12-07 12:07:00 +01:00 committed by Wolfgang Bumiller
parent c874209657
commit 64d39c2ef2
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/API2/Replication.pm
View File

@ -72,7 +72,7 @@ sub run_single_job {
# passing $now and $verbose is useful for regression testing
sub run_jobs {
my ($now, $logfunc, $verbose) = @_;
my ($now, $logfunc, $verbose, $mail) = @_;
my $iteration = $now // time();
@ -83,7 +83,21 @@ sub run_jobs {
while (my $jobcfg = PVE::ReplicationState::get_next_job($iteration, $start_time)) {
my $guest_class = $lookup_guest_class->($jobcfg->{vmtype});
PVE::Replication::run_replication($guest_class, $jobcfg, $iteration, $start_time, $logfunc, 1, $verbose);
eval {
PVE::Replication::run_replication($guest_class, $jobcfg, $iteration, $start_time, $logfunc, $verbose);
};
if (my $err = $@) {
warn "$jobcfg->{id}: got unexpected replication job error - $err";
my $state = PVE::ReplicationState::read_state();
my $jobstate = PVE::ReplicationState::extract_job_state($state, $jobcfg);
eval {
PVE::Tools::sendmail('root', "Replication Job: $jobcfg->{id} failed", $err)
if $jobstate->{fail_count} == 1 && $mail;
};
warn ": $@" if $@;
};
$start_time = $now // time();
}
};

11
PVE/CLI/pvesr.pm
View File

@ -221,12 +221,21 @@ __PACKAGE__->register_method ({
default => 0,
optional => 1,
},
mail => {
description => "Send an email notification in case of a failure.",
type => 'boolean',
default => 0,
optional => 1,
},
},
},
returns => { type => 'null' },
code => sub {
my ($param) = @_;
die "Mail and id are mutually exclusive!\n"
if $param->{id} && $param->{mail};
my $logfunc;
if ($param->{verbose}) {
@ -242,7 +251,7 @@ __PACKAGE__->register_method ({
} else {
PVE::API2::Replication::run_jobs(undef, $logfunc);
PVE::API2::Replication::run_jobs(undef, $logfunc, 0, $param->{mail});
}
return undef;

2
bin/init.d/pvesr.service
View File

@ -4,4 +4,4 @@ ConditionPathExists=/usr/bin/pvesr
[Service]
Type=oneshot
ExecStart=/usr/bin/pvesr run
ExecStart=/usr/bin/pvesr run --mail 1