switchman-inst-jobs 4.0.12 → 4.0.14

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchmanInstJobs
   module Switchman
     module Shard
@@ -28,9 +30,9 @@ module SwitchmanInstJobs
         return unless wait
 
         delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
-          while ::Delayed::Job.where(shard_id: id).
-              where.not(locked_at: nil).
-              where.not(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY).exists?
+          while ::Delayed::Job.where(shard_id: id)
+                              .where.not(locked_at: nil)
+                              .where.not(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY).exists?
             sleep 10
             lock_jobs_for_hold
           end
@@ -44,18 +46,18 @@ module SwitchmanInstJobs
           # Wait a little over the 60 second in-process shard cache clearing
           # threshold to ensure that all new jobs are now being enqueued
           # unlocked
-          Rails.logger.debug('Waiting for caches to clear')
+          Rails.logger.debug("Waiting for caches to clear")
           sleep(65)
         end
         delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
-          ::Delayed::Job.where(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY, shard_id: id).
-            in_batches(of: 10_000).
-            update_all(
-              locked_by: nil,
-              locked_at: nil,
-              attempts: 0,
-              failed_at: nil
-            )
+          ::Delayed::Job.where(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY, shard_id: id)
+                        .in_batches(of: 10_000)
+                        .update_all(
+                          locked_by: nil,
+                          locked_at: nil,
+                          attempts: 0,
+                          failed_at: nil
+                        )
         end
       end
 
@@ -105,25 +107,27 @@ module SwitchmanInstJobs
         end
 
         def delayed_jobs_shards
-          return none unless ::Switchman::Shard.columns_hash.key?('delayed_jobs_shard_id')
+          return none unless ::Switchman::Shard.columns_hash.key?("delayed_jobs_shard_id")
 
-          scope = ::Switchman::Shard.unscoped.
-            where(id: ::Switchman::Shard.unscoped.distinct.where.not(delayed_jobs_shard_id: nil).
-            select(:delayed_jobs_shard_id))
+          scope = ::Switchman::Shard.unscoped
+                                    .where(id: ::Switchman::Shard.unscoped
+                                                                 .distinct
+                                                                 .where.not(delayed_jobs_shard_id: nil)
+                                    .select(:delayed_jobs_shard_id))
           db_jobs_shards = ::Switchman::DatabaseServer.all.map { |db| db.config[:delayed_jobs_shard] }.uniq
           db_jobs_shards.delete(nil)
-          has_self = db_jobs_shards.delete('self')
+          has_self = db_jobs_shards.delete("self")
           scope = scope.or(::Switchman::Shard.unscoped.where(id: db_jobs_shards)) unless db_jobs_shards.empty?
 
           if has_self
-            self_dbs = ::Switchman::DatabaseServer.all.
-              select { |db| db.config[:delayed_jobs_shard] == 'self' }.map(&:id)
-            scope = scope.or(::Switchman::Shard.unscoped.
-              where(id: ::Switchman::Shard.unscoped.where(delayed_jobs_shard_id: nil, database_server_id: self_dbs).
-              select(:id)))
+            self_dbs = ::Switchman::DatabaseServer.all
+                                                  .select { |db| db.config[:delayed_jobs_shard] == "self" }.map(&:id)
+            scope = scope.or(::Switchman::Shard.unscoped
+              .where(id: ::Switchman::Shard.unscoped.where(delayed_jobs_shard_id: nil, database_server_id: self_dbs)
+              .select(:id)))
           end
           @jobs_scope_empty = !scope.exists? unless instance_variable_defined?(:@jobs_scope_empty)
-          return [::Switchman::Shard.default] if @jobs_scope_empty
+          return ::Switchman::Shard.where(id: ::Switchman::Shard.default.id) if @jobs_scope_empty
 
           ::Switchman::Shard.merge(scope)
         end

data/lib/switchman_inst_jobs/timed_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchmanInstJobs
   class TimedCache
     def initialize(timeout, &block)

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchmanInstJobs
-  VERSION = '4.0.12'.freeze
+  VERSION = "4.0.14"
 end

data/lib/switchman_inst_jobs/yaml_extensions.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module SwitchmanInstJobs
   module PsychExt
     module ToRuby
       def visit_Psych_Nodes_Scalar(object) # rubocop:disable Naming/MethodName
-        if object.tag == '!ruby/ActiveRecord:Switchman::Shard'
+        if object.tag == "!ruby/ActiveRecord:Switchman::Shard"
           ::Switchman::Shard.lookup(object.value) ||
             raise(Delayed::Backend::RecordNotFound,
                   "Couldn't find Switchman::Shard with id #{object.value.inspect}")

data/lib/switchman_inst_jobs.rb

@@ -1,5 +1,7 @@
-require 'inst-jobs'
-require 'switchman'
+# frozen_string_literal: true
+
+require "inst-jobs"
+require "switchman"
 
 module SwitchmanInstJobs
   cattr_accessor :delayed_jobs_shard_fallback
@@ -35,21 +37,21 @@ module SwitchmanInstJobs
   end
 end
 
-require 'switchman_inst_jobs/active_record/connection_adapters/postgresql_adapter'
-require 'switchman_inst_jobs/active_record/migration'
-require 'switchman_inst_jobs/delayed/settings'
-require 'switchman_inst_jobs/delayed/backend/active_record/abstract_job'
-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/engine'
-require 'switchman_inst_jobs/guard_rail'
-require 'switchman_inst_jobs/jobs_migrator'
-require 'switchman_inst_jobs/new_relic'
-require 'switchman_inst_jobs/switchman/database_server'
-require 'switchman_inst_jobs/switchman/default_shard'
-require 'switchman_inst_jobs/switchman/shard'
-require 'switchman_inst_jobs/timed_cache'
-require 'switchman_inst_jobs/yaml_extensions'
+require "switchman_inst_jobs/active_record/connection_adapters/postgresql_adapter"
+require "switchman_inst_jobs/active_record/migration"
+require "switchman_inst_jobs/delayed/settings"
+require "switchman_inst_jobs/delayed/backend/active_record/abstract_job"
+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/engine"
+require "switchman_inst_jobs/guard_rail"
+require "switchman_inst_jobs/jobs_migrator"
+require "switchman_inst_jobs/new_relic"
+require "switchman_inst_jobs/switchman/database_server"
+require "switchman_inst_jobs/switchman/default_shard"
+require "switchman_inst_jobs/switchman/shard"
+require "switchman_inst_jobs/timed_cache"
+require "switchman_inst_jobs/yaml_extensions"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.12
+  version: 4.0.14
 platform: ruby
 authors:
 - Bryan Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -219,19 +219,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-inst
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement