From 4eba76711b4686ffc2faaf568e7491061ec35eb4 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 28 Nov 2016 19:11:36 +0100 Subject: [PATCH] Adding backtracing to Salmon/Processing workers --- app/models/subscription.rb | 2 +- app/services/update_remote_profile_service.rb | 2 ++ app/workers/processing_worker.rb | 1 + app/workers/salmon_worker.rb | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/subscription.rb b/app/models/subscription.rb index e968c6675d..497cabb095 100644 --- 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 26ab84d752..56b25816f2 100644 --- 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 3b11a4c5ea..34433a7939 100644 --- 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 24fb940129..4a6ccf54d9 100644 --- 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))