Adding backtracing to Salmon/Processing workers

diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index e968c6675d68aa7ba0c4755cfaf80ef5c80acb70..497cabb095bab632b93581f8236186bd4259841d 100644 (file)
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Subscription < ApplicationRecord
-  MIN_EXPIRATION = 3600 * 24
+  MIN_EXPIRATION = 3600 * 24 * 7
   MAX_EXPIRATION = 3600 * 24 * 30
 
   belongs_to :account

diff --git a/app/services/update_remote_profile_service.rb b/app/services/update_remote_profile_service.rb
index 26ab84d75243b887ab5290bc606406fae5837911..56b25816f2a4de438771e1c12c49db1e2121ae83 100644 (file)
--- a/app/services/update_remote_profile_service.rb
+++ b/app/services/update_remote_profile_service.rb
@@ -5,6 +5,8 @@ class UpdateRemoteProfileService < BaseService
   DFRN_NS = 'http://purl.org/macgirvin/dfrn/1.0'
 
   def call(xml, account, resubscribe = false)
+    return if xml.nil?
+
     author_xml = xml.at_xpath('./xmlns:author') || xml.at_xpath('./dfrn:owner', dfrn: DFRN_NS)
     hub_link   = xml.at_xpath('./xmlns:link[@rel="hub"]')
 

diff --git a/app/workers/processing_worker.rb b/app/workers/processing_worker.rb
index 3b11a4c5ea52cd3bf2115cba512765a54339aae8..34433a7939136a0d953acd44e7e3b9906932f2b5 100644 (file)
--- a/app/workers/processing_worker.rb
+++ b/app/workers/processing_worker.rb
@@ -2,6 +2,7 @@
 
 class ProcessingWorker
   include Sidekiq::Worker
+  sidekiq_options backtrace: true
 
   def perform(account_id, body)
     ProcessFeedService.new.call(body, Account.find(account_id))

diff --git a/app/workers/salmon_worker.rb b/app/workers/salmon_worker.rb
index 24fb940129d3ce2733794f04032deb87015ee5e8..4a6ccf54d94bab7d0f44c7eee557f52fdfbe1b3d 100644 (file)
--- a/app/workers/salmon_worker.rb
+++ b/app/workers/salmon_worker.rb
@@ -2,6 +2,7 @@
 
 class SalmonWorker
   include Sidekiq::Worker
+  sidekiq_options backtrace: true
 
   def perform(account_id, body)
     ProcessInteractionService.new.call(body, Account.find(account_id))