Merge branch 'main' into remove-rails-dependency

Author: nimmolo

app/models/solid_queue/semaphore.rb

@@ -26,7 +26,6 @@ def self.signal_all(jobs)
 
       def initialize(job)
         @job = job
-        @retries = 0
       end
 
       def wait
@@ -42,42 +41,26 @@ def signal
       end
 
       private
-        attr_accessor :job, :retries
+        attr_accessor :job
 
         def attempt_creation
           Semaphore.create!(key: key, value: limit - 1, expires_at: expires_at)
           true
         rescue ActiveRecord::RecordNotUnique
-          attempt_decrement
+          if limit == 1 then false
+          else
+            attempt_decrement
+          end
         end
 
         def attempt_decrement
           Semaphore.available.where(key: key).update_all([ "value = value - 1, expires_at = ?", expires_at ]) > 0
-        rescue ActiveRecord::Deadlocked
-          if retriable? then attempt_retry
-          else
-            raise
-          end
         end
 
         def attempt_increment
           Semaphore.where(key: key, value: ...limit).update_all([ "value = value + 1, expires_at = ?", expires_at ]) > 0
         end
 
-        def attempt_retry
-          self.retries += 1
-
-          if semaphore = Semaphore.find_by(key: key)
-            semaphore.value > 0 && attempt_decrement
-          end
-        end
-
-        MAX_RETRIES = 1
-
-        def retriable?
-          retries < MAX_RETRIES
-        end
-
         def key
           job.concurrency_key
         end

solid_queue.gemspec

@@ -5,13 +5,13 @@ Gem::Specification.new do |spec|
   spec.version     = SolidQueue::VERSION
   spec.authors     = [ "Rosa Gutierrez" ]
   spec.email       = [ "[email protected]" ]
-  spec.homepage    = "http://github.com/basecamp/solid_queue"
+  spec.homepage    = "https://github.com/basecamp/solid_queue"
   spec.summary     = "Database-backed Active Job backend."
   spec.description = "Database-backed Active Job backend."
   spec.license     = "MIT"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "http://github.com/basecamp/solid_queue"
+  spec.metadata["source_code_uri"] = "https://github.com/basecamp/solid_queue"
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]