Skip to content

Commit d1635f0

Browse files
committed
Pass error domains to post-backup script as well
1 parent 6ca92d0 commit d1635f0

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Diff for: backup.cgi

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ else {
335335
# Run any after command
336336
if ($in{'oneoff'} && $sched->{'after'}) {
337337
&$first_print($text{'backup_arun'});
338-
&set_backup_envs($sched, \@doms, $ok);
338+
&set_backup_envs($sched, \@doms, $ok, $errdoms);
339339
$out = &backquote_command(
340340
"($sched->{'after'}) 2>&1 </dev/null");
341341
&reset_backup_envs();

Diff for: backup.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ package virtual_server;
197197
# Run any after command
198198
if ($sched->{'after'}) {
199199
&$first_print("Running post-backup command ..");
200-
&set_backup_envs($sched, \@doms, $ok);
200+
&set_backup_envs($sched, \@doms, $ok, $errdoms);
201201
$out = &backquote_command("($sched->{'after'}) 2>&1 </dev/null");
202202
&reset_backup_envs();
203203
print $out;

Diff for: backups-lib.pl

+4-2
Original file line numberDiff line numberDiff line change
@@ -6937,11 +6937,11 @@ sub suffix_to_compression
69376937
$file =~ /\.tar$/i ? 2 : -1;
69386938
}
69396939

6940-
# set_backup_envs(&backup, &doms, [ok|failed])
6940+
# set_backup_envs(&backup, &doms, ok-flag, &error-doms)
69416941
# Set environment variables from a backup object
69426942
sub set_backup_envs
69436943
{
6944-
my ($sched, $doms, $status) = @_;
6944+
my ($sched, $doms, $status, $errdoms) = @_;
69456945
foreach my $k (keys %$sched) {
69466946
$ENV{'BACKUP_'.uc($k)} = $sched->{$k};
69476947
}
@@ -6954,6 +6954,8 @@ sub set_backup_envs
69546954
}
69556955
}
69566956
$ENV{'BACKUP_DOMAIN_NAMES'} = join(" ", map { $_->{'dom'} } @$doms);
6957+
$ENV{'BACKUP_ERROR_NAMES'} = join(" ", map { $_->{'dom'} } @$errdoms)
6958+
if ($errdoms);
69576959
$ENV{'BACKUP_STATUS'} = $status if (defined($status));
69586960
}
69596961

0 commit comments

Comments
 (0)