faktory_worker_ruby 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 601942270c2185c3d6950e04d9cffcfa03256689
-  data.tar.gz: 51254887f57c7338d086ff07a7e76e9b511fcc53
+  metadata.gz: 746a9be3c60d6dda246d9bfadc0cbb5364635928
+  data.tar.gz: 8b7647102cf7e973c3927b95c1a2e6f8d000aeb6
 SHA512:
-  metadata.gz: 8f22aa99ebfa7d4e79d4b3157561cc14716355716e257c05252539b2ef23ce811f7531d2802722629905427a83e6670c934d8eab977bde9e8bc93737db65ca46
-  data.tar.gz: b0e723333032496197fd07a5a90441836885d2fb408860e0292a354abbb89d043aca27cfba4ad4d592d1225def1a5e24e7ff747405834cd5448ad417cd04bd1b
+  metadata.gz: 76013e6dc045ceb3cdb178815869271e9b6c89250dac467058c087834abb6c666a28f15989023c054e6b692d90dd0f1ce07a0b856da9e992145e9fab9f0830dd
+  data.tar.gz: a478076c6058f919b18828ee08c6855ad89e3ca80dcd3d91fd5fe75259c411a5494dcd48d6857aaf52171ccc023f607348320f27a0b91ed50e6554c78cb626e5

data/Changes.md

@@ -0,0 +1,9 @@
+# Changes
+
+## 0.6.0
+
+- Updates for Faktory 0.6.0 and protocol V2.
+
+## 0.5.0
+
+- Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faktory_worker_ruby (0.5.0)
+    faktory_worker_ruby (0.6.0)
       connection_pool (~> 2.2, >= 2.2.1)
 
 GEM

data/README.md

@@ -38,6 +38,10 @@ Next, install this gem:
 
     gem install faktory_worker_ruby
 
+## Documentation
+
+See the [wiki](//github.com/contribsys/faktory_worker_ruby/wiki) for more details.
+
 ## Your First Job
 
 Your Jobs should include the Faktory::Job module and have a `perform`

data/faktory_worker_ruby.gemspec

@@ -7,13 +7,12 @@ Gem::Specification.new do |gem|
   gem.email         = ["mike@contribsys.com"]
   gem.summary       = "Ruby worker for Faktory"
   gem.description   = "Ruby worker for Faktory."
-  gem.homepage      = "http://contribsys.com"
+  gem.homepage      = "http://github.com/contribsys/faktory_worker_ruby"
   gem.license       = "LGPL-3.0"
 
   gem.executables   = ['faktory-worker']
   gem.files         = `git ls-files | grep -Ev '^(test|myapp|examples)'`.split("\n")
   gem.test_files    = []
-  gem.require_paths = ["lib"]
   gem.version       = Faktory::VERSION
   gem.required_ruby_version = ">= 2.2.2"
 

data/lib/faktory/cli.rb

@@ -41,6 +41,8 @@ module Faktory
     # global process state irreversibly.  PRs which improve the
     # test coverage of Faktory::CLI are welcomed.
     def run
+      Faktory::Client.worker!
+
       boot_system
       print_banner
 
@@ -71,7 +73,7 @@ module Faktory
       fire_event(:startup)
 
       logger.debug { "Client Middleware: #{Faktory.client_middleware.map(&:klass).join(', ')}" }
-      logger.debug { "Execute Middleware: #{Faktory.worker_middleware.map(&:klass).join(', ')}" }
+      logger.debug { "Worker Middleware: #{Faktory.worker_middleware.map(&:klass).join(', ')}" }
 
       logger.info 'Starting processing, hit Ctrl-C to stop' if $stdout.tty?
 

data/lib/faktory/client.rb

@@ -8,7 +8,13 @@ module Faktory
   class ParseError < StandardError;end
 
   class Client
-    @@random_process_wid = SecureRandom.hex(8)
+    @@random_process_wid = ""
+
+    # Called when booting the worker process to signal that this process
+    # will consume jobs and send BEAT.
+    def self.worker!
+      @@random_process_wid = SecureRandom.hex(8)
+    end
 
     attr_accessor :middleware
 
@@ -88,7 +94,7 @@ module Faktory
           str
         else
           hash = JSON.parse(str)
-          hash["signal"]
+          hash["state"]
         end
       end
     end
@@ -108,7 +114,8 @@ module Faktory
     end
 
     def tls?
-      @location.hostname !~ /\Alocalhost\z/ || @location.scheme =~ /tls/
+      # Support TLS with this convention: "tcp+tls://:password@myhostname:port/"
+      @location.scheme =~ /tls/
     end
 
     def open
@@ -132,20 +139,35 @@ module Faktory
         "hostname": Socket.gethostname,
         "pid": $$,
         "labels": ["ruby-#{RUBY_VERSION}"],
+        "v": 2,
       }
 
       hi = result
 
       if hi =~ /\AHI (.*)/
         hash = JSON.parse($1)
-        # TODO verify version tag
+        ver = hash["v"].to_i
+        if ver > 2
+          puts "Warning: Faktory server protocol #{ver} in use, this worker doesn't speak that version."
+          puts "We recommend you upgrade this gem with `bundle up faktory_worker_ruby`."
+        end
+
         salt = hash["s"]
         if salt
           pwd = @location.password
           if !pwd
             raise ArgumentError, "Server requires password, but none has been configured"
           end
-          payload["pwdhash"] = Digest::SHA256.hexdigest(pwd + salt)
+          iter = hash["i"] || 1
+          raise ArgumentError, "Invalid hashing" if iter < 1
+
+          sha = Digest::SHA256.new
+          hashing = pwd + salt
+          iter.times do
+            sha.update(hashing)
+            hashing = sha.digest
+          end
+          payload["pwdhash"] = sha.hexdigest
         end
       end
 
@@ -185,9 +207,9 @@ module Faktory
         line[1..-1].strip
       elsif chr == '$'
         count = line[1..-1].strip.to_i
-        data = nil
+        return nil if count == -1
         data = @sock.read(count) if count > 0
-        line = @sock.gets
+        line = @sock.gets # read extra linefeeds
         data
       elsif chr == '-'
         raise CommandError, line[1..-1]

data/lib/faktory/rails.rb

@@ -9,7 +9,7 @@ module Faktory
       #
       # None of this matters on the client-side, only within the Faktory executor itself.
       #
-      Faktory.configure_exec do |_|
+      Faktory.configure_worker do |_|
         Faktory.options[:reloader] = Faktory::Rails::Reloader.new
       end
     end

data/lib/faktory/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Faktory
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/faktory_worker_ruby.rb

@@ -0,0 +1 @@
+require 'faktory'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faktory_worker_ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -81,6 +81,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Changes.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -105,7 +106,8 @@ files:
 - lib/faktory/rails.rb
 - lib/faktory/util.rb
 - lib/faktory/version.rb
-homepage: http://contribsys.com
+- lib/faktory_worker_ruby.rb
+homepage: http://github.com/contribsys/faktory_worker_ruby
 licenses:
 - LGPL-3.0
 metadata: {}