hirefire-resource 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9483a65248d4c218eebfbc663e16d6a5894b623c
-  data.tar.gz: f1c5a0c7c206b04196d6a3974c6c59d59e92491a
+  metadata.gz: 7a837ad85215ea4c9fb9db5d9df59e9d2efb9682
+  data.tar.gz: 019bb5a936269518290899332c41fc1b4c831e5c
 SHA512:
-  metadata.gz: c1c752cf3a8621dfdc24f10a86389bfc093b244743b41a8acac636c8e287051c39c9d244a8fda7770042f0a205acbdd9f582dd08ff883102faf8e9875015f035
-  data.tar.gz: fdbefd6e8555f33fed3ab535d0f7294321ea84aa6c3ddd3da0920a12b76385f4682287ed3273f6a35c333cfe20f6c1ce4324cdb172b60fb00e2cf3431abeb0b0
+  metadata.gz: 8f79e026eea2e841a67faeec56bceb7acf835dd08f31100447782de70c7715505cda00437fed0a72d33ffe6917dc944e0e9f11bcc73f422b2d3232b57bc0de22
+  data.tar.gz: fc1cb09f2e55ec48999f0a3a4ac01eec489696c44241d7f03babf6afbf93a20bd76d6f94daf8a33f2f23f92fb5866dd97ae835730c2c9ac96acd57f7549b9f59

data/hirefire-resource.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name = "hirefire-resource"
-  gem.version = "0.3.5"
+  gem.version = "0.3.6"
   gem.platform = Gem::Platform::RUBY
   gem.authors = "Michael van Rooijen"
   gem.email = "michael@hirefire.io"

data/lib/hirefire/macro/resque.rb

@@ -19,13 +19,17 @@ module HireFire
         queues = queues.flatten.map(&:to_s)
         queues = ::Resque.queues if queues.empty?
 
-        in_queues = queues.inject(0) do |memo, queue|
-          memo += ::Resque.size(queue)
-          memo
-        end
+        redis = ::Resque.redis
+        ids = Array(redis.smembers(:workers)).compact
+        raw_jobs = redis.pipelined { ids.map { |id| redis.get("worker:#{id}") } }
+        jobs = raw_jobs.map { |raw_job| ::Resque.decode(raw_job) || {} }
 
-        in_progress = ::Resque::Worker.all.inject(0) do |memo, worker|
-          memo += 1 if queues.include?(worker.job["queue"])
+        in_queues = redis.pipelined do
+          queues.map { |queue| redis.llen("queue:#{queue}") }
+        end.map(&:to_i).inject(&:+)
+
+        in_progress = jobs.inject(0) do |memo, job|
+          memo += 1 if queues.include?(job["queue"])
           memo
         end
 
@@ -34,4 +38,3 @@ module HireFire
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies: []
 description: Load-based scaling, schedule-based scaling, dyno crash recovery, for
   web- and worker dynos.
@@ -61,4 +61,3 @@ signing_key:
 specification_version: 4
 summary: Autoscaling for your Heroku dynos
 test_files: []
-has_rdoc: