switchman-inst-jobs 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e9ee17c392694f339d9ce769cb0edca2a33f8fb71b573d44bb943a4d076ce96
-  data.tar.gz: 748976de1add47043aca059e25fa667259c8f00a843ef023c65cec432b1c7fc3
+  metadata.gz: 35759761780a2dc32fb4e098517571bb5f4fba43435ed15771a497fd527ec133
+  data.tar.gz: 1ec1ffde947de99b9af7ef7f75830092ae4e9fabc651edf2cbf78b78a9cda5fa
 SHA512:
-  metadata.gz: 339dc8140ddb2cf061c64d4eae47a926a198a593e08ffc84691bdf08f842c5bb12e4983a333f83141c88551c5b7d3b43ea5e2801e23a69aa02e9ea0f085ee17b
-  data.tar.gz: 371062a3e07f2f7730687df17e8e268dfba4e61b45c4ce5db677b154b313cfba717af6051e2070231aa68422d9ff711e59da9c9427c2f9fce5d4ecbbc595d105
+  metadata.gz: e463c81e1a261e322ba4ce26974a8fc19e9ca68fbdf4c59c54cf9fc7b0a2e3fc6ca92e8092e02dbb94b2990c7152a7ca4f21254aa51e37fa951fc51630b16e33
+  data.tar.gz: 3919ccc98ea6bed1bdc8284eec26f7c3c3a282b49f43a81e4179a4535760b9d20533b6b477ef945e98f7f6f3e0bb273ca60eaca85969ab486bc68afc75789064

data/lib/switchman_inst_jobs.rb

@@ -19,6 +19,7 @@ module SwitchmanInstJobs
     ::Delayed::Backend::Redis::Job.column :shard_id, :integer
     ::Delayed::Pool.prepend Delayed::Pool
     ::Delayed::Worker.prepend Delayed::Worker
+    ::Delayed::Worker::HealthCheck.prepend Delayed::Worker::HealthCheck
     ::Object.include Delayed::MessageSending
   end
 
@@ -39,6 +40,7 @@ require 'switchman_inst_jobs/delayed/backend/base'
 require 'switchman_inst_jobs/delayed/message_sending'
 require 'switchman_inst_jobs/delayed/pool'
 require 'switchman_inst_jobs/delayed/worker'
+require 'switchman_inst_jobs/delayed/worker/health_check'
 require 'switchman_inst_jobs/railtie'
 require 'switchman_inst_jobs/shackles'
 require 'switchman_inst_jobs/switchman/database_server'

data/lib/switchman_inst_jobs/delayed/worker.rb

@@ -5,6 +5,16 @@ module SwitchmanInstJobs
         base.singleton_class.prepend(ClassMethods)
       end
 
+      def initialize(options = {})
+        # have to initialize this first, so #shard works
+        @config = options
+        ::Delayed::Worker::HealthCheck.munge_service_name(shard) do
+          super
+          # ensure to instantiate with the munged config
+          health_check
+        end
+      end
+
       def start
         shard.activate(:delayed_jobs) { super }
       end

data/lib/switchman_inst_jobs/delayed/worker/health_check.rb

@@ -0,0 +1,34 @@
+module SwitchmanInstJobs
+  module Delayed
+    module Worker
+      module HealthCheck
+        def self.prepended(base)
+          base.singleton_class.prepend(ClassMethods)
+        end
+
+        module ClassMethods
+          def munge_service_name(shard)
+            # munge the name to add the current shard
+            original_service_name = ::Delayed::Settings.worker_health_check_config['service_name']
+            ::Delayed::Settings.worker_health_check_config['service_name'] = "#{original_service_name || ::Delayed::Worker::ConsulHealthCheck::DEFAULT_SERVICE_NAME}/#{shard.id}"
+            yield
+          ensure
+            ::Delayed::Settings.worker_health_check_config['service_name'] = original_service_name
+          end
+
+          def reschedule_abandoned_jobs(call_super: false)
+            shards = ::Switchman::Shard.delayed_jobs_shards
+            call_super = true if shards.length == 1
+            return munge_service_name(::Switchman::Shard.current(:delayed_jobs)) { super() } if call_super
+
+            ::Switchman::Shard.with_each_shard(shards, [:delayed_jobs]) do
+              self.send_later_enqueue_args(:reschedule_abandoned_jobs,
+                                           { singleton: "periodic: Delayed::Worker::HealthCheck.reschedule_abandoned_jobs:#{::Switchman::Shard.current(:delayed_jobs).id}" },
+                                           call_super: true)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/switchman_inst_jobs/switchman/database_server.rb

@@ -8,7 +8,7 @@ module SwitchmanInstJobs
           ::Switchman::Shard.lookup(config[:delayed_jobs_shard])
         # have to avoid recursion for the default shard asking for the default
         # shard's delayed_jobs_shard
-        dj_shard ||= shard if shard.default?
+        dj_shard ||= shard if shard&.default?
         dj_shard || ::Switchman::Shard.default.delayed_jobs_shard
       end
     end

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -14,7 +14,7 @@ module SwitchmanInstJobs
           shard = ::Switchman::Shard.lookup(delayed_jobs_shard_id)
           return shard if shard
         end
-        database_server.try(:delayed_jobs_shard, self)
+        database_server&.delayed_jobs_shard(self)
       end
 
       module ClassMethods
@@ -51,6 +51,22 @@ module SwitchmanInstJobs
           db = ::Switchman::DatabaseServer.server_for_new_shard
           db.create_new_shard
         end
+
+        def delayed_jobs_shards
+          @delayed_jobs_shards ||= begin
+            db_dj_shards = ::Switchman::DatabaseServer.all.map do |db|
+              next db.shards.to_a if db.config[:delayed_jobs_shard] == 'self'
+              db.delayed_jobs_shard
+            end.compact.flatten.uniq # yes, all three
+            shard_dj_shards = ::Switchman::Shard.
+                where.not(delayed_jobs_shard_id: nil).
+                distinct.
+                pluck(:delayed_jobs_shard_id).
+                map { |id| ::Switchman::Shard.lookup(id) }.
+                compact
+            (db_dj_shards + shard_dj_shards).uniq.sort
+          end
+        end
       end
     end
   end

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Bryan Petty
@@ -84,6 +84,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: imperium
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +240,7 @@ files:
 - lib/switchman_inst_jobs/delayed/message_sending.rb
 - lib/switchman_inst_jobs/delayed/pool.rb
 - lib/switchman_inst_jobs/delayed/worker.rb
+- lib/switchman_inst_jobs/delayed/worker/health_check.rb
 - lib/switchman_inst_jobs/railtie.rb
 - lib/switchman_inst_jobs/shackles.rb
 - lib/switchman_inst_jobs/switchman/database_server.rb