queue_classic_plus 4.0.0.alpha13 → 4.0.0.alpha15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fad0727ccc431b046daa9fa899876a8ff9da6737f332568b16f0caff2a9b611
-  data.tar.gz: e5049e96e9b9fa22a3cfa9af539110deefadcc2895567d762c17757a882c50c9
+  metadata.gz: 634ceaedff254e0c5382a484d574d6971101362a88b9d2185303d95298de06c8
+  data.tar.gz: '03509124366e931f02d928226da3b05ec3e625c5888eaba88f5669ee090566b6'
 SHA512:
-  metadata.gz: '093dce00414281ddb7ea7ea910033a6859eb57fc0d3f1b1c953a5451690009d0209d730f2d6964da12307e8418ff7247f51e398fda6ffacc145450bf12825841'
-  data.tar.gz: 162549c1ded09273f540abd9f554b1f84164112557f2adee9945451262682f684749ca3fb88b3fb177c599a34e7cc040978085d082e3f6a65bf7325867ecaebd
+  metadata.gz: 4c8b6ff9e377c59b579c7309ee1f75e3fb583b00450ef09548f46d5d6e921c2553cf64037b259a1267b2781276f2e06ccceb3c8e5d6bc76373dc9e64e7a61522
+  data.tar.gz: d3852486ebdf22d4c59d142a8f00257f2fa7b0847d09704001644e56cb5ab91845ba154807bc2699491f379b62c98656da7b70735c9b3d3ba13638efaddfefb6

data/README.md

@@ -126,7 +126,7 @@ end
 
 ## Advanced configuration
 
-If you want to log exceptions in your favorite exception tracker. You can configured it like sso:
+If you want to log exceptions in your favorite exception tracker. You can configured it like so:
 
 ```ruby
 QueueClassicPlus.exception_handler = -> (exception, job) do
@@ -142,20 +142,26 @@ Push metrics to your metric provider (only Librato is supported for now).
 QueueClassicPlus.update_metrics
 ```
 
-Call this is a cron job or something similar.
+Call this in a cron job or something similar.
 
-If you are using NewRelic and want to push performance data to it, you can add this to an initializer:
+If you are using New Relic and want to push performance data to it, you can add this to an initializer:
 
 ```ruby
 require "queue_classic_plus/new_relic"
 ```
 
-To instrument DataDog monitoring add this to your QC initializer:
+To instrument Datadog monitoring add this to your QC initializer:
 
 ```ruby
 require "queue_classic_plus/datadog"
 ```
 
+The Datadog service name defaults to `qc.job`. This can be changed in the initializer: 
+
+```ruby
+QueueClassicDatadog.config.dd_service = "custom_service_name"
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/queue_classic_plus/fork )
@@ -172,4 +178,7 @@ createdb queue_classic_plus_test
 
 ## Releasing
 
-Releasing is done in CircleCI via the `push_to_rubygems`, triggered by pushing a tagged commit. To do so, simply [create a new GitHub release](https://github.com/rainforestapp/queue_classic_plus/releases/new).
+Releasing is done in CircleCI via the `push_to_rubygems`, triggered by pushing a tagged commit.
+You can create a new `tag` while [creating a new GitHub release](https://github.com/rainforestapp/queue_classic_plus/releases/new).
+
+_** Note: The `tag` is what publishes a new version of the gem. The `release` is purely for documentation._

data/lib/queue_classic_plus/base.rb

@@ -6,6 +6,10 @@ module QueueClassicPlus
       QC::Queue.new(@queue)
     end
 
+    def self.queue_name_digest
+      @queue_name_digest ||= @queue.to_s.to_i(36)
+    end
+
     inheritable_attr :locked
     inheritable_attr :skip_transaction
     inheritable_attr :retries_on
@@ -75,9 +79,19 @@ module QueueClassicPlus
     end
 
     def self.enqueue(method, *args)
-      if can_enqueue?(method, *args)
-        queue.enqueue(method, *serialized(args))
-      end
+       conn = QC.default_conn_adapter.connection
+       check_and_enqueue = proc do
+         conn.exec("SELECT pg_advisory_xact_lock(#{queue_name_digest})")
+         if can_enqueue?(method, *args)
+           queue.enqueue(method, *serialized(args))
+         end
+       end
+
+       if [PG::PQTRANS_ACTIVE, PG::PQTRANS_INTRANS].include?(conn.transaction_status)
+         check_and_enqueue.call
+       else
+         conn.transaction &check_and_enqueue
+       end
     end
 
     def self.enqueue_perform(*args)

data/lib/queue_classic_plus/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicPlus
-  VERSION = '4.0.0.alpha13'.freeze
+  VERSION = '4.0.0.alpha15'.freeze
 end

data/spec/base_spec.rb

@@ -12,9 +12,15 @@ describe QueueClassicPlus::Base do
       end
 
       it "does not allow multiple enqueues" do
-        subject.do
-        subject.do
-        expect(subject).to have_queue_size_of(1)
+        threads = []
+        50.times do
+          threads << Thread.new do
+            subject.do
+            expect(subject).to have_queue_size_of(1)
+          end
+        end
+
+        threads.each(&:join)
       end
 
       it "checks for an existing job using the same serializing as job enqueuing" do
@@ -38,6 +44,23 @@ describe QueueClassicPlus::Base do
       end
     end
 
+    context "when in a transaction" do
+      subject do
+        Class.new(QueueClassicPlus::Base) do
+          @queue = :test
+          lock!
+        end
+      end
+
+      it "does not create another transaction when enqueueing" do
+        conn = QC.default_conn_adapter.connection
+        expect(conn).to receive(:transaction).exactly(1).times.and_call_original
+        conn.transaction do
+          subject.do
+        end
+      end
+    end
+
     context "with default settings" do
       subject do
         Class.new(QueueClassicPlus::Base) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_plus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha13
+  version: 4.0.0.alpha15
 platform: ruby
 authors:
 - Simon Mathieu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: queue_classic