heroscale 0.0.2 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroscale (0.0.2)
+    heroscale (0.1.0)
 
 GEM
   remote: http://rubygems.org/

data/heroscale.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "heroscale"
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.authors = ["Jacques Crocker"]
   s.summary = "Autoscale your heroku app"

data/lib/heroscale/middleware.rb

@@ -11,10 +11,11 @@ module Heroscale
         queue_wait_time = env['HTTP_X_HEROKU_QUEUE_WAIT_TIME']
         queue_depth = env['HTTP_X_HEROKU_QUEUE_DEPTH']
         dynos_in_use = env['HTTP_X_HEROKU_DYNOS_IN_USE']
+        job_queue = count_jobs || 0
 
         if queue_wait_time and queue_depth and dynos_in_use
           # format the response on heroku
-          res = %|{"heroku": true, "queue_wait_time": #{queue_wait_time.to_i}, "queue_depth": #{queue_depth.to_i}, "dynos_in_use": #{dynos_in_use.to_i}}|
+          res = %|{"heroku": true, "queue_wait_time": #{queue_wait_time.to_i}, "queue_depth": #{queue_depth.to_i}, "dynos_in_use": #{dynos_in_use.to_i}, "job_queue": #{job_queue}}|
         else
           res = %|{"heroku": false}|
         end
@@ -25,5 +26,21 @@ module Heroscale
       end
     end
 
+    protected
+
+    # count the pending jobs for Delayed::Job or Resque
+    def count_jobs
+      if defined?(Delayed::Job)
+        Delayed::Job.count
+      elsif defined?(Resque) and ENV["QUEUE"]
+        Resque.size(ENV["QUEUE"])
+      else
+        0
+      end
+    rescue => e
+      puts "Error counting jobs: #{e.to_s}"
+      return 0
+    end
+
   end
 end

data/spec/heroscale/middleware_spec.rb

@@ -71,4 +71,11 @@ describe Heroscale::Middleware do
     end
   end
 
+  context "when DelayedJob is installed" do
+    it "should return the queue count"
+  end
+
+  context "when Resque is installed" do
+    it "should return the queue count"
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2259297854901398522
+      hash: 1580003485100128021
       segments: 
       - 0
       version: "0"
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2259297854901398522
+      hash: 1580003485100128021
       segments: 
       - 0
       version: "0"