faktory_worker_ruby 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a183f21103562c224add2460da73a145a0c12c32a167525fd18dd02fe334241
-  data.tar.gz: b7c76d7001ba133f685427ffcc00bcdd75d026747106fac705b741e57f3d7b94
+  metadata.gz: ca8f1a3c8f94200639fe96c6ed6664ab02e3240a4176d73463cfd185bf0dd577
+  data.tar.gz: c0a039afe5d4a3ca54d5c8ef779c282cd2266bce6665998c8da60d1829fa4cb2
 SHA512:
-  metadata.gz: 6bae416fa9d2675c586a8a40ccce0005f665eb2ab2bc19e6a5e12405cafee67aef22984d9e84f6db96012143eee87307d81e089fad5fd81d6dd278489fe62437
-  data.tar.gz: 42806775422a7542a1a7c7e912bc373dfe8c0d2b1d47d8cccb3ce8d91a0c1a95f8a835cb99cc1b9da2262d17ac3f50e7447ecefcf4eff6ba3ef0d9672e8b1f06
+  metadata.gz: 3ccf18cb61e1428fa6443c7f9862861d959bbf40d0914f94c8457642c97e72be367c5e3d019ae3a9cfc30f65dae22ad865b591892f6985a3a460d44dc442c378
+  data.tar.gz: c9822086ef38bf740abd2a6b6afd099305e0d1998e0adcdefb6dbf5ccb84d7b4a6497ef22359320d13fef70899dfb7ebf29c361bd405ea7bb93eb41463719070

data/Changes.md

@@ -1,5 +1,11 @@
 # Changes
 
+## 1.1.0
+
+- Send process RSS to Faktory for /Busy page
+- Implement QUEUE PAUSE/RESUME client commands
+- Fix broken `complete` callback with batches
+
 ## 1.0.3
 
 - Fix corruption in `custom` hash elements [#55]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faktory_worker_ruby (1.0.2)
+    faktory_worker_ruby (1.1.0)
       connection_pool (~> 2.2, >= 2.2.2)
 
 GEM

data/faktory_worker_ruby.gemspec

@@ -16,6 +16,14 @@ Gem::Specification.new do |gem|
   gem.version       = Faktory::VERSION
   gem.required_ruby_version = ">= 2.5.0"
 
+  gem.metadata = {
+    "homepage_uri" => "https://contribsys.com/faktory",
+    "bug_tracker_uri" => "https://github.com/contribsys/faktory_worker_ruby/issues",
+    "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",
+  }
+
   gem.add_dependency                  'connection_pool', '~> 2.2', ">= 2.2.2"
   gem.add_development_dependency      'activejob', '>= 5.2.0'
   gem.add_development_dependency      'minitest', '~> 5'

data/lib/faktory/batch.rb

@@ -98,7 +98,7 @@ module Faktory
 
     def complete=(val)
       raise "Batch cannot be modified once created" if bid
-      @success = to_callback(val)
+      @complete = to_callback(val)
     end
 
     def jobs(&block)

data/lib/faktory/cli.rb

@@ -212,7 +212,7 @@ module Faktory
       if !File.exist?(options[:require]) ||
          (File.directory?(options[:require]) && !File.exist?("#{options[:require]}/config/application.rb"))
         logger.info "=================================================================="
-        logger.info "  Please point Faktory to a Rails 5 application or a Ruby file  "
+        logger.info "  Please point Faktory to a Rails application or a Ruby file  "
         logger.info "  to load your worker classes with -r [DIR|FILE]."
         logger.info "=================================================================="
         logger.info @parser

data/lib/faktory/client.rb

@@ -141,6 +141,22 @@ module Faktory
       end
     end
 
+    def pause_queues(queues)
+      qs = Array(queues)
+      transaction do
+        command "QUEUE PAUSE", qs.join(" ")
+        ok
+      end
+    end
+
+    def resume_queues(queues)
+      qs = Array(queues)
+      transaction do
+        command "QUEUE RESUME", qs.join(" ")
+        ok
+      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
@@ -188,13 +204,11 @@ module Faktory
     # Return a string signal to process, legal values are "quiet" or "terminate".
     # The quiet signal is informative: the server won't allow this process to FETCH
     # any more jobs anyways.
-    def beat(current_state = nil)
+    def beat(current_state = nil, hash)
       transaction do
-        if current_state.nil?
-          command("BEAT", %Q[{"wid":"#{@@random_process_wid}"}])
-        else
-          command("BEAT", %Q[{"wid":"#{@@random_process_wid}", "current_state":"#{current_state}"}])
-        end
+        hash["wid"] = @@random_process_wid
+        hash["current_state"] = current_state if current_state
+        command("BEAT", Faktory.dump_json(hash))
 
         str = result!
         if str == "OK"

data/lib/faktory/launcher.rb

@@ -60,7 +60,7 @@ module Faktory
         $0 = PROCTITLES.map {|p| p.call }.join(" ")
 
         begin
-          result = Faktory.server {|c| c.beat(@current_state) }
+          result = Faktory.server {|c| c.beat(@current_state, "rss_kb" => memory_usage(::Process.pid)) }
           case result
           when "OK"
             # all good
@@ -78,5 +78,26 @@ module Faktory
       end
     end
 
+    MEMORY_GRABBER = case RUBY_PLATFORM
+    when /linux/
+      ->(pid) {
+        IO.readlines("/proc/#{$$}/status").each do |line|
+          next unless line.start_with?("VmRSS:")
+          break line.split[1].to_i
+        end
+      }
+    when /darwin|bsd/
+      ->(pid) {
+        `ps -o pid,rss -p #{pid}`.lines.last.split.last.to_i
+      }
+    else
+      ->(pid) { 0 }
+    end
+
+    def memory_usage(pid)
+      MEMORY_GRABBER.call(pid)
+    end
+
+
   end
 end

data/lib/faktory/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faktory_worker_ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -132,7 +132,12 @@ files:
 homepage: https://github.com/contribsys/faktory_worker_ruby
 licenses:
 - LGPL-3.0
-metadata: {}
+metadata:
+  homepage_uri: https://contribsys.com/faktory
+  bug_tracker_uri: https://github.com/contribsys/faktory_worker_ruby/issues
+  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:
@@ -148,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Ruby worker for Faktory