From 5edff32733eff2cbffbf614b31eea85da8dc3aaf Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 15 Apr 2020 20:33:24 +0200
Subject: Change delivery failure tracking to work with hostnames instead of
 URLs (#13437)

---
 db/migrate/20200407201300_create_unavailable_domains.rb  |  9 +++++++++
 db/migrate/20200407202420_migrate_unavailable_inboxes.rb | 16 ++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 db/migrate/20200407201300_create_unavailable_domains.rb
 create mode 100644 db/migrate/20200407202420_migrate_unavailable_inboxes.rb

(limited to 'db/migrate')

diff --git a/db/migrate/20200407201300_create_unavailable_domains.rb b/db/migrate/20200407201300_create_unavailable_domains.rb
new file mode 100644
index 000000000..56b477da5
--- /dev/null
+++ b/db/migrate/20200407201300_create_unavailable_domains.rb
@@ -0,0 +1,9 @@
+class CreateUnavailableDomains < ActiveRecord::Migration[5.2]
+  def change
+    create_table :unavailable_domains do |t|
+      t.string :domain, default: '', null: false, index: { unique: true }
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20200407202420_migrate_unavailable_inboxes.rb b/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
new file mode 100644
index 000000000..0dce26c6f
--- /dev/null
+++ b/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
@@ -0,0 +1,16 @@
+class MigrateUnavailableInboxes < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    urls = Redis.current.smembers('unavailable_inboxes')
+
+    urls.each do |url|
+      host = Addressable::URI.parse(url).normalized_host
+      UnavailableDomain.create(domain: host)
+    end
+
+    Redis.current.del(*(['unavailable_inboxes'] + Redis.current.keys('exhausted_deliveries:*')))
+  end
+
+  def down; end
+end
-- 
cgit 


From ea200a178e3b94299fe7990b7787e988b5678407 Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Thu, 16 Apr 2020 15:03:24 +0900
Subject: Fix migration 20200407202420_migrate_unavailable_inboxes (#13481)

---
 db/migrate/20200407202420_migrate_unavailable_inboxes.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'db/migrate')

diff --git a/db/migrate/20200407202420_migrate_unavailable_inboxes.rb b/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
index 0dce26c6f..92a3acb5d 100644
--- a/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
+++ b/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
@@ -4,8 +4,13 @@ class MigrateUnavailableInboxes < ActiveRecord::Migration[5.2]
   def up
     urls = Redis.current.smembers('unavailable_inboxes')
 
-    urls.each do |url|
-      host = Addressable::URI.parse(url).normalized_host
+    hosts = urls.map do |url|
+      Addressable::URI.parse(url).normalized_host
+    end.compact.uniq
+
+    UnavailableDomain.delete_all
+
+    hosts.each do |host|
       UnavailableDomain.create(domain: host)
     end
 
-- 
cgit