faktory_worker_ruby 1.3.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abc45bf7c07e61197705a9283c38e6d399a81701f433d8a5eded1e6cb6b480e3
-  data.tar.gz: ac96de6c442ad806cf3cafa5fc839e5509454a8f315229f4014cddfcd9bbb28e
+  metadata.gz: effc5e0683ad3dda06516e048c0855a9a7eabfeac799bc20340a01ea181c531e
+  data.tar.gz: 76e824912d51ac9e9d53f8971076d8155dbb4c74448a3f47bdbba663bb824f9a
 SHA512:
-  metadata.gz: ef6262279803c776c204d2efd58bb547617519bf8277a78e3a46f3789e39bff21220134556f8c209b3d7fd26eb85627b24062f721de3c87324acb0063ec778e4
-  data.tar.gz: 6de7bd208b4ab94ab57b3513159c5ab047f5144fb6152365d52535e3274f8306a416a1124f1c299fe0269542bdb61670958323b8be2285face085f8e3f53ae35
+  metadata.gz: 24a4d33c1eb0b81ed82664d2b1ad4b8f3c0a608f49b567f89adfbed85bd2bdfc2d667b2745a997229cda9c06b81b19d552b5a852dc6ea70b563bf61e176b8819
+  data.tar.gz: 6fa8af5d29d4eede89e51ef35be4a9e789a677518655e592a5c6ad95ab495e62443cd9a9b837cb88dba7f1b14aa326b1eec14eb0223c4ba9184093fb181fb5c3

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
     runs-on: ubuntu-latest
     services:
       faktory:

data/.standard.yml

@@ -1,4 +1,4 @@
-ruby_version: 2.5.0
+ruby_version: 2.7.0
 fix: true
 parallel: true
 ignore:

data/Changes.md

@@ -1,5 +1,17 @@
 # Changes
 
+## 2.1.0
+
+- Require ActiveJob 7.0+, connection_pool 2.5+
+- Improve support for TLS connections [#84]
+- Gracefully handle OpenSSL errors during transactions [#83]
+
+## 2.0.0
+
+- Allow more connections in pool [#455]
+- Minimum Ruby version is now 2.7.
+- Minimum Rails version is now 6.0.
+
 ## 1.3.0
 
 - Fix `faktory/testing` [#74]

data/Gemfile.lock

@@ -1,69 +1,100 @@
 PATH
   remote: .
   specs:
-    faktory_worker_ruby (1.3.0)
-      connection_pool (~> 2.2, >= 2.2.2)
+    faktory_worker_ruby (2.1.0)
+      connection_pool (~> 2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    activejob (8.0.2)
+      activesupport (= 8.0.2)
       globalid (>= 0.3.6)
-    activesupport (7.0.4.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.0)
-    docile (1.4.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    i18n (1.12.0)
+      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)
+    docile (1.4.1)
+    drb (2.2.1)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
-    minitest (5.18.0)
-    minitest-hooks (1.5.0)
+    json (2.11.3)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    minitest (5.25.5)
+    minitest-hooks (1.5.2)
       minitest (> 5.3)
-    parallel (1.22.1)
-    parser (3.2.2.0)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
+      racc
+    prism (1.4.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
-    rubocop (1.48.1)
+    rake (13.2.1)
+    regexp_parser (2.10.0)
+    rubocop (1.75.5)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.16.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 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.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    standard (1.25.3)
+    standard (1.49.0)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (~> 1.48.1)
-      rubocop-performance (~> 1.16.0)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.75.2)
+      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)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.25.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
 
 PLATFORMS
   ruby
@@ -76,3 +107,6 @@ DEPENDENCIES
   rake
   simplecov
   standard
+
+BUNDLED WITH
+   2.4.22

data/README.md

@@ -34,10 +34,10 @@ server part is [here](https://github.com/contribsys/faktory/)
 
 ## Requirements
 
-* Ruby 2.5 or higher
-* Faktory 1.2 or higher [Installation](https://github.com/contribsys/faktory/wiki/Installation)
+* Ruby 2.7 or higher
+* Faktory 1.8 or higher [Installation](https://github.com/contribsys/faktory/wiki/Installation)
 
-Optionally, Rails 5.2+ for ActiveJob.
+Optionally, Rails 6.0+ for ActiveJob.
 
 ## Installation
 
@@ -79,7 +79,7 @@ bundle exec faktory-worker
 
 Sidekiq is awesome; it's stable and useful. It suffers from two design limitations:
 
-1. Sidekiq uses Redis and Redis is dumb datastore, all Sidekiq features are
+1. Sidekiq uses Redis and Redis is a plain datastore, all Sidekiq features are
    implemented in Ruby and have to travel over the network to access data.
 2. Because of (1), Sidekiq is limited to Ruby.  You can't execute jobs
    with, e.g., Python and get the same Sidekiq features.
@@ -97,4 +97,4 @@ PRs to improve this are very welcome).
 
 ## Author
 
-Mike Perham, @getajobmike, mike @ contribsys.com
+Mike Perham, [@getajobmike](https://ruby.social/@getajobmike), mike @ contribsys.com

data/faktory_worker_ruby.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.executables = ["faktory-worker"]
   gem.files = `git ls-files | grep -Ev '^(test|myapp|examples)'`.split("\n")
   gem.version = Faktory::VERSION
-  gem.required_ruby_version = ">= 2.5.0"
+  gem.required_ruby_version = ">= 2.7.0"
 
   gem.metadata = {
     "homepage_uri" => "https://contribsys.com/faktory",
@@ -22,8 +22,8 @@ Gem::Specification.new do |gem|
     "source_code_uri" => "https://github.com/contribsys/faktory_worker_ruby"
   }
 
-  gem.add_dependency "connection_pool", "~> 2.2", ">= 2.2.2"
-  gem.add_development_dependency "activejob", ">= 5.2.0"
+  gem.add_dependency "connection_pool", "~> 2.5"
+  gem.add_development_dependency "activejob", ">= 7.0.0"
   gem.add_development_dependency "minitest", "~> 5"
   gem.add_development_dependency "minitest-hooks"
   gem.add_development_dependency "rake"

data/lib/faktory/client.rb

@@ -4,7 +4,6 @@ require "uri"
 require "cgi"
 require "digest"
 require "securerandom"
-require "timeout"
 require "faktory/io"
 
 module Faktory
@@ -55,9 +54,9 @@ module Faktory
       super
       @debug = debug
       @location = URI(url)
-      @timeout = timeout
+      @sock = nil
 
-      open_socket(@timeout)
+      open_socket
     end
 
     def close
@@ -240,7 +239,7 @@ module Faktory
     private
 
     def debug(line)
-      puts line
+      Faktory.logger.info(line)
     end
 
     def tls?
@@ -249,18 +248,23 @@ module Faktory
     end
 
     # NB: aliased by faktory/testing
-    def open_socket(timeout = DEFAULT_TIMEOUT)
+    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)
 
         ctx = OpenSSL::SSL::SSLContext.new
-        ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_PEER)
         ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
+        ENV["FAKTORY_DISABLE_HOSTNAME_VERIFICATION"] ?
+          ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_NONE) :
+          ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_PEER)
 
         @sock = OpenSSL::SSL::SSLSocket.new(sock, ctx).tap do |socket|
           socket.sync_close = true
+          socket.hostname = @location.hostname
           socket.connect
         end
       else
@@ -302,6 +306,20 @@ module Faktory
 
       command("HELLO", Faktory.dump_json(payload))
       ok
+    rescue Errno::ECONNRESET, Faktory::TimeoutError
+      # A tcp client talking to a TLS server will get ECONNRESET
+      if tls?
+        raise
+      else
+        raise("Server using TLS? Use FAKTORY_URL=tcp+tls://... to enable encryption")
+      end
+    rescue *tlserrors
+      # A TLS client talking to a TCP server will get OpenSSL::SSL::SSLError
+      if tls?
+        raise("Server not using TLS? Use FAKTORY_URL=tcp://... to disable encryption")
+      else
+        raise
+      end
     end
 
     def command(*args)
@@ -317,11 +335,11 @@ module Faktory
       # have an underlying socket.  Now if you disable testing and try to use that
       # client, it will crash without a socket.  This open() handles that case to
       # transparently open a socket.
-      open_socket(@timeout) if !@sock
+      open_socket if !@sock
 
       begin
         yield
-      rescue SystemCallError, SocketError, TimeoutError
+      rescue SystemCallError, SocketError, Faktory::TimeoutError, OpenSSL::SSL::SSLError
         if retryable
           retryable = false
 
@@ -331,7 +349,7 @@ module Faktory
             nil
           end
           @sock = nil
-          open_socket(@timeout)
+          open_socket
           retry
         else
           raise
@@ -347,9 +365,9 @@ module Faktory
       raise Errno::ECONNRESET, "No response" unless line
       chr = line[0]
       if chr == "+"
-        line[1..-1].strip
+        line[1..].strip
       elsif chr == "$"
-        count = line[1..-1].strip.to_i
+        count = line[1..].strip.to_i
         return nil if count == -1
         data = read(count) if count > 0
         _ = gets # read extra linefeeds
@@ -362,7 +380,7 @@ module Faktory
         #
         # -NOTUNIQUE Job not unique
         # We return ["NOTUNIQUE", "Job not unique"]
-        err = line[1..-1].split(" ", 2)
+        err = line[1..].split(" ", 2)
         raise CommandError, err[1] if err[0] == "ERR"
         err
       else

data/lib/faktory/connection.rb

@@ -6,7 +6,7 @@ module Faktory
   class Connection
     class << self
       def create(options = {})
-        size = Faktory.worker? ? (Faktory.options[:concurrency] + 2) : 5
+        size = Faktory.worker? ? (Faktory.options[:concurrency] + 5) : 20
         ConnectionPool.new(timeout: options[:pool_timeout] || 1, size: size) do
           Faktory::Client.new(**options)
         end

data/lib/faktory/io.rb

@@ -1,4 +1,5 @@
 require "io/wait"
+require "timeout"
 
 # this is the necessary magic to get a line-oriented protocol to
 # respect a read timeout. unfortunately Ruby sockets do not provide any

data/lib/faktory/job.rb

@@ -173,7 +173,7 @@ module Faktory
             m = "#{name}="
             undef_method(m) if method_defined?(m) || private_method_defined?(m)
           end
-          define_singleton_method("#{name}=") do |val|
+          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 }

data/lib/faktory/logging.rb

@@ -62,7 +62,7 @@ module Faktory
     end
 
     def self.logger=(log)
-      @logger = (log || Logger.new(File::NULL))
+      @logger = log || Logger.new(File::NULL)
     end
 
     def logger

data/lib/faktory/rails.rb

@@ -22,7 +22,7 @@ module Faktory
         # None of this matters on the client-side, only within the Faktory executor itself.
         #
         Faktory.configure_worker do |_|
-          if ::Rails::VERSION::MAJOR < 5
+          if ::Rails::VERSION::MAJOR < 6
             raise "Your current version of Rails, #{::Rails::VERSION::STRING}, is not supported"
           end
 
@@ -58,9 +58,9 @@ module Faktory
     end
   end
 
-  if defined?(::Rails) && ::Rails::VERSION::MAJOR < 5
+  if defined?(::Rails) && ::Rails::VERSION::MAJOR < 6
     warn("**************************************************")
-    warn("🚫 ERROR: Faktory Worker does not support Rails versions under 5.x - please ensure your workers are updated")
+    warn("🚫 ERROR: Faktory Worker does not support Rails version < 6.x")
     warn("**************************************************")
     warn("")
   end

data/lib/faktory/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: faktory_worker_ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Mike Perham
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2025-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -16,34 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +132,6 @@ metadata:
   documentation_uri: https://github.com/contribsys/faktory_worker_ruby/wiki
   changelog_uri: https://github.com/contribsys/faktory_worker_ruby/blob/master/Changes.md
   source_code_uri: https://github.com/contribsys/faktory_worker_ruby
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ruby worker for Faktory
 test_files: []