faktory_worker_ruby 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: effc5e0683ad3dda06516e048c0855a9a7eabfeac799bc20340a01ea181c531e
-  data.tar.gz: 76e824912d51ac9e9d53f8971076d8155dbb4c74448a3f47bdbba663bb824f9a
+  metadata.gz: 5bc50e5880ae9251f03af00d572ba2f8ede535c8b32dc46a78f575b2b029d928
+  data.tar.gz: 4af492a8da94673d2be33ef8bbae0f6fedbe88586ffcd4fb3b0b1e1c259a179f
 SHA512:
-  metadata.gz: 24a4d33c1eb0b81ed82664d2b1ad4b8f3c0a608f49b567f89adfbed85bd2bdfc2d667b2745a997229cda9c06b81b19d552b5a852dc6ea70b563bf61e176b8819
-  data.tar.gz: 6fa8af5d29d4eede89e51ef35be4a9e789a677518655e592a5c6ad95ab495e62443cd9a9b837cb88dba7f1b14aa326b1eec14eb0223c4ba9184093fb181fb5c3
+  metadata.gz: 920a1448f12e688036b9282e1e7e3971de3a0bd6db99a28b0f160a1e41bf86c79b4f579a3e5e2fe08d437a7a9f42bf3933cb683f9d011a673f4d06c2e97a2d91
+  data.tar.gz: dd0b203e37eace0dc4949b056932e2ba24b55502349bf29c4df584309833828d27206fb33bdcec7a73eb2cad4132a6e87926bc3bc992cd3a2a053bb7a97794bd

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
+        ruby: ["3.2", "3.3", "3.4"]
     runs-on: ubuntu-latest
     services:
       faktory:
@@ -20,7 +20,7 @@ jobs:
             - 7419:7419
             - 7420:7420
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true

data/Changes.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2.1.2
+
+- Fix race condition in `faktory_options`. [#523]
+
+## 2.1.1
+
+- Add new `Faktory::Client#queue_latency` API
+- Require OpenSSL for client
+- Bump requirements for Ruby, Rails
+
 ## 2.1.0
 
 - Require ActiveJob 7.0+, connection_pool 2.5+

data/Gemfile.lock

@@ -1,57 +1,56 @@
 PATH
   remote: .
   specs:
-    faktory_worker_ruby (2.1.0)
+    faktory_worker_ruby (2.1.2)
       connection_pool (~> 2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (8.0.2)
-      activesupport (= 8.0.2)
+    activejob (8.1.2)
+      activesupport (= 8.1.2)
       globalid (>= 0.3.6)
-    activesupport (8.0.2)
+    activesupport (8.1.2)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
     ast (2.4.3)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
     docile (1.4.1)
-    drb (2.2.1)
-    globalid (1.2.1)
+    drb (2.2.3)
+    globalid (1.3.0)
       activesupport (>= 6.1)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.11.3)
-    language_server-protocol (3.17.0.4)
+    json (2.18.0)
+    language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    minitest (5.25.5)
-    minitest-hooks (1.5.2)
+    minitest (5.27.0)
+    minitest-hooks (1.5.3)
       minitest (> 5.3)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.10.1)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
+    prism (1.8.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.10.0)
-    rubocop (1.75.5)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rubocop (1.82.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -59,48 +58,48 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-performance (1.25.0)
+      prism (~> 1.7)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    standard (1.49.0)
+    standard (1.53.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.75.2)
+      rubocop (~> 1.82.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.8.0)
+    standard-performance (1.9.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.25.0)
+      rubocop-performance (~> 1.26.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activejob
+  activejob (>= 7.0.0, >= 0)
   faktory_worker_ruby!
   minitest (~> 5)
   minitest-hooks
@@ -109,4 +108,4 @@ DEPENDENCIES
   standard
 
 BUNDLED WITH
-   2.4.22
+  4.0.4

data/README.md

@@ -34,10 +34,10 @@ server part is [here](https://github.com/contribsys/faktory/)
 
 ## Requirements
 
-* Ruby 2.7 or higher
-* Faktory 1.8 or higher [Installation](https://github.com/contribsys/faktory/wiki/Installation)
+* Ruby 3.2 or higher
+* Faktory 1.9 or higher [Installation](https://github.com/contribsys/faktory/wiki/Installation)
 
-Optionally, Rails 6.0+ for ActiveJob.
+Optionally, Rails 7.0+ for ActiveJob.
 
 ## Installation
 

data/lib/faktory/client.rb

@@ -5,6 +5,7 @@ require "cgi"
 require "digest"
 require "securerandom"
 require "faktory/io"
+require "openssl"
 
 module Faktory
   class BaseError < StandardError; end
@@ -158,6 +159,15 @@ module Faktory
       end
     end
 
+    def queue_latency(*queues)
+      qs = Array(queues)
+      raise ArgumentError, "no queue given" if qs.empty?
+      transaction do
+        command "QUEUE LATENCY", qs.join(" ")
+        JSON.parse(result!)
+      end
+    end
+
     # Push a hash corresponding to a job payload to Faktory.
     # Hash must contain "jid", "jobtype" and "args" elements at minimum.
     # Returned value will either be the JID String if successful OR
@@ -251,7 +261,6 @@ module Faktory
     def open_socket
       tlserrors = []
       if tls?
-        require "openssl"
         tlserrors << ::OpenSSL::SSL::SSLError
         sock = TCPSocket.new(@location.hostname, @location.port)
         sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)

data/lib/faktory/job.rb

@@ -122,6 +122,8 @@ module Faktory
     end
 
     module ClassMethods
+      ACCESSOR_MUTEX = Mutex.new
+
       def set(options)
         opts = get_faktory_options.dup
         opts["jobtype"] = self
@@ -162,10 +164,18 @@ module Faktory
         instance_writer = true
 
         attrs.each do |name|
+          synchronized_getter = "__synchronized_#{name}"
+
           singleton_class.instance_eval do
             undef_method(name) if method_defined?(name) || private_method_defined?(name)
           end
-          define_singleton_method(name) { nil }
+
+          define_singleton_method(synchronized_getter) { nil }
+          singleton_class.class_eval do
+            private(synchronized_getter)
+          end
+
+          define_singleton_method(name) { ACCESSOR_MUTEX.synchronize { send synchronized_getter } }
 
           ivar = "@#{name}"
 
@@ -175,8 +185,10 @@ module Faktory
           end
           define_singleton_method(:"#{name}=") do |val|
             singleton_class.class_eval do
-              undef_method(name) if method_defined?(name) || private_method_defined?(name)
-              define_method(name) { val }
+              ACCESSOR_MUTEX.synchronize do
+                undef_method(synchronized_getter) if method_defined?(synchronized_getter) || private_method_defined?(synchronized_getter)
+                define_method(synchronized_getter) { val }
+              end
             end
 
             if singleton_class?

data/lib/faktory/middleware/chain.rb

@@ -67,6 +67,7 @@ module Faktory
   module Middleware
     class Chain
       include Enumerable
+
       attr_reader :entries
 
       def initialize_copy(copy)

data/lib/faktory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Faktory
-  VERSION = "2.1.0"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: faktory_worker_ruby
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Mike Perham
 bindir: bin
 cert_chain: []
-date: 2025-05-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Ruby worker for Faktory
 test_files: []