hirefire-resource 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf414cb7e6529a04049ad3e7a7575a1932ec91fc8be57d8a2ce1ccc0922ab49
-  data.tar.gz: 8c78e71660e89df170ca061a328bfaff3d19714d55bf3a8fac04a59fbd9f2569
+  metadata.gz: 14b05a951639660419ec0e420647752fef4b8e33ad615c0b4706cc70a9ceab87
+  data.tar.gz: 2567a0a3a2d287d220d80f085b835093b845989969484c4ed1a13460ef07ee2b
 SHA512:
-  metadata.gz: 2f84e86124b9467d166a839b3c90fd979ac13ccb4f50005dfa0e61e77763191206714a569fe59ea991da41b287d3a165a4740ea49f603ecc65caebc2d924c654
-  data.tar.gz: ce69dbda35b2762f727caa5e0d9fb5c76b3890ffa33cec9c20e46cc021d5b54f5842f337fc7264b00453dcf7074c3befd0db1970f89964ffb3703944d1837bb5
+  metadata.gz: 66fa48f86bf1377cb4ce1aa93e460621255a0f4802004d8ed3ba35ecb2fd59bfd86aa980589d9d6f4c6d69e5070195c7214c90858bb1f261dab799691e5ae643
+  data.tar.gz: ace370aec4f4e8c60d0caa521b996917a3eaee8598a5515219c00e07335a7b211dad9f962bf3b9ae0fb618520ec565c6fc0802a12243f1977d7719c83682f4f4

data/hirefire-resource.gemspec

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

data/lib/hirefire/macro/que.rb

@@ -4,14 +4,8 @@ module HireFire
   module Macro
     module Que
       QUERY =  %{
-SELECT count(*)                                                          AS total,
-       count(locks.job_id)                                               AS running,
-       coalesce(sum((error_count > 0 AND locks.job_id IS NULL)::int), 0) AS failing,
-       coalesce(sum((error_count = 0 AND locks.job_id IS NULL)::int), 0) AS scheduled
-FROM que_jobs LEFT JOIN (
-  SELECT (classid::bigint << 32) + objid::bigint AS job_id
-  FROM pg_locks WHERE locktype = 'advisory'
-) locks USING (job_id) }.freeze
+SELECT count(*) AS total
+FROM que_jobs WHERE run_at < now() }.freeze
 
       extend self
 
@@ -26,9 +20,9 @@ FROM que_jobs LEFT JOIN (
       # @return [Integer] the number of jobs in the queue(s).
       #
       def queue(queue = nil)
-        query = queue ? "#{QUERY} WHERE queue = '#{queue}'" : QUERY
+        query = queue ? "#{QUERY} AND queue = '#{queue}'" : QUERY
         results = ::Que.execute(query).first
-        results["total"].to_i - results["failing"].to_i
+        results["total"].to_i
       end
     end
   end

data/lib/hirefire/middleware.rb

@@ -90,14 +90,10 @@ module HireFire
     # @return [String] in application/json format.
     #
     def build_info_response
-      entry_builder = lambda do |config|
+      entries = HireFire::Resource.dynos.map do |config|
         %({"name":"#{config[:name]}","quantity":#{config[:quantity].call || "null"}})
       end
 
-      entries = HireFire::Resource.dynos.inject([]) do |buffer, config|
-        buffer << entry_builder.call(config)
-      end
-
       status                   = 200
       headers                  = Hash.new
       headers["Content-Type"]  = "application/json"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-07-13 00:00:00.000000000 Z
 dependencies: []
 description: Load- and schedule-based scaling for web- and worker dynos
 email: michael@hirefire.io
@@ -56,8 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Autoscaling for your Heroku dynos