[pve-devel] [PATCH v2 pve-manager 29/52] api: replication: adapt to matcher-based notification system

Lukas Wagner l.wagner at proxmox.com
Tue Nov 14 13:59:37 CET 2023


Signed-off-by: Lukas Wagner <l.wagner at proxmox.com>
---
 PVE/API2/Replication.pm | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/PVE/API2/Replication.pm b/PVE/API2/Replication.pm
index d61518ba..0dc944c9 100644
--- a/PVE/API2/Replication.pm
+++ b/PVE/API2/Replication.pm
@@ -129,7 +129,7 @@ my sub _handle_job_err {
     # The replication job is run every 15 mins if no schedule is set.
     my $schedule = $job->{schedule} // '*/15';
 
-    my $properties = {
+    my $template_data = {
 	"failure-count" => $fail_count,
 	"last-sync"     => $jobstate->{last_sync},
 	"next-sync"     => $next_sync,
@@ -139,19 +139,18 @@ my sub _handle_job_err {
 	"error"         => $err,
     };
 
+    my $metadata_fields = {
+	# TODO: Add job-id?
+	type => "replication",
+    };
+
     eval {
-	my $dcconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
-	my $target = $dcconf->{notify}->{'target-replication'} // PVE::Notify::default_target();
-	my $notify = $dcconf->{notify}->{'replication'} // 'always';
-
-	if ($notify eq 'always') {
-	    PVE::Notify::error(
-		$target,
-		$replication_error_subject_template,
-		$replication_error_body_template,
-		$properties
-	    );
-	}
+	PVE::Notify::error(
+	    $replication_error_subject_template,
+	    $replication_error_body_template,
+	    $template_data,
+	    $metadata_fields
+	);
 
     };
     warn ": $@" if $@;
-- 
2.39.2






More information about the pve-devel mailing list