proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-08 12:56:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #3955: vzdump: new: also send mail for error during job-init hook

Browse Source 
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2022-04-19 10:45:22 +02:00 committed by Thomas Lamprecht
parent 3c5a7616cf
commit c527d28f0c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PVE/VZDump.pm
View File

@ -497,13 +497,6 @@ sub new {
$opts->{storage} = 'local'; $opts->{storage} = 'local';
} }
$self->{job_init_log} = '';
open my $job_init_fd, '>', \$self->{job_init_log};
$self->run_hook_script('job-init', undef, $job_init_fd);
close $job_init_fd;
PVE::Cluster::cfs_update(); # Pick up possible changes made by the hook script.
my $errors = ''; my $errors = '';
my $add_error = sub { my $add_error = sub {
my ($error) = @_; my ($error) = @_;
@ -512,6 +505,16 @@ sub new {
$errors .= $error; $errors .= $error;
}; };
eval {
$self->{job_init_log} = '';
open my $job_init_fd, '>', \$self->{job_init_log};
$self->run_hook_script('job-init', undef, $job_init_fd);
close $job_init_fd;
PVE::Cluster::cfs_update(); # Pick up possible changes made by the hook script.
};
$add_error->($@) if $@;
if ($opts->{storage}) { if ($opts->{storage}) {
my $storage_cfg = PVE::Storage::config(); my $storage_cfg = PVE::Storage::config();
eval { PVE::Storage::activate_storage($storage_cfg, $opts->{storage}) }; eval { PVE::Storage::activate_storage($storage_cfg, $opts->{storage}) };