From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A9D06DA37 for ; Tue, 19 Apr 2022 10:45:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9DAFD25863 for ; Tue, 19 Apr 2022 10:45:27 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 804512584E for ; Tue, 19 Apr 2022 10:45:26 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 546E6421BD for ; Tue, 19 Apr 2022 10:45:26 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 19 Apr 2022 10:45:22 +0200 Message-Id: <20220419084522.17916-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220419084522.17916-1-f.ebner@proxmox.com> References: <20220419084522.17916-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.099 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH manager 2/2] fix #3955: vzdump: new: also send mail for error during job-init hook X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2022 08:45:57 -0000 Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index bdf270f7..3a394db7 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -497,13 +497,6 @@ sub new { $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 $add_error = sub { my ($error) = @_; @@ -512,6 +505,16 @@ sub new { $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}) { my $storage_cfg = PVE::Storage::config(); eval { PVE::Storage::activate_storage($storage_cfg, $opts->{storage}) }; -- 2.30.2