From 698b3a0bf6bbbaf6b84a8c0c961de081e2c1989b Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 17 Mar 2023 17:39:41 -0300
Subject: [PATCH] =?UTF-8?q?feat:=20separar=20la=20creaci=C3=B3n=20de=20DP?=
 =?UTF-8?q?=20de=20njalla?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/deploy_distributed_press.rb | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index bd80dca4..9afc6a5d 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -15,7 +15,7 @@ require 'njalla/v1'
 class DeployDistributedPress < Deploy
   store :values, accessors: %i[hostname remote_site_id remote_info], coder: JSON
 
-  before_create :create_remote_site!
+  before_create :create_remote_site!, :create_njalla_records!
 
   # Actualiza la información y luego envía los cambios
   #
@@ -27,10 +27,9 @@ class DeployDistributedPress < Deploy
 
     time_start
 
-    if remote_site_id.blank? || remote_info['njalla'].blank?
-      create_remote_site!
-      save
-    end
+    create_remote_site! if remote_site_id.blank?
+    create_njalla_records! if remote_info['njalla'].blank?
+    save
 
     site_client.tap do |c|
       stdout = Thread.new(publisher.logger_out) do |io|
@@ -115,7 +114,16 @@ class DeployDistributedPress < Deploy
 
     self.remote_site_id = created_site[:id]
     self.remote_info = created_site.to_h
+  rescue DistributedPress::V1::Error
+    ExceptionNotifier.notify_exception(e, data: { site: site.name })
+  ensure
+    nil
+  end
 
+  # Crea los registros en Njalla
+  #
+  # @return [nil]
+  def create_njalla_records!
     # XXX: Esto depende de nuestro DNS actual, cuando lo migremos hay
     # que eliminarlo.
     unless site.name.end_with? '.'
@@ -123,7 +131,7 @@ class DeployDistributedPress < Deploy
       self.remote_info['njalla']['a'] = njalla.add_record(name: site.name, type: 'CNAME', content: "#{Site.domain}.").to_h
       self.remote_info['njalla']['ns'] = njalla.add_record(name: "_dnslink.#{site.name}", type: 'NS', content: "#{publisher.hostname}.").to_h
     end
-  rescue DistributedPress::V1::Error, HTTParty::Error => e
+  rescue HTTParty::Error => e
     ExceptionNotifier.notify_exception(e, data: { site: site.name })
   ensure
     nil