que-view 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 062e48206fe33c45a7f007d831b31a5c4566d6eb4af6891cfad6949108f45b56
-  data.tar.gz: c3c2fd233567554fc46e7296a9895d7e8c7b650789fcb1fb7f49d2d023cc3670
+  metadata.gz: fcbc566936eae22f23cba44ed6908437fba07dbf621128895f4fe4e40319ad61
+  data.tar.gz: a7f2213f756286321699a96f10e1b69c1578e91dff46daa877c37db41898efde
 SHA512:
-  metadata.gz: 3a4b0f0e2bac21033c9e3db5a8ea193b599679e88abb064f7a07b71608893e861e192196d2b688f70c8f9cf5c092d48b40925bfa190d1760172965ac8c319149
-  data.tar.gz: 3db157d3fb95fa530c43607ac9c7924b9ca84cbc305f134ae08635048d77c0213e71401770e4e8c30bbffbfc414c4f233d17bd5896ce2b661b12d464f1914c93
+  metadata.gz: 6250a8886b4d258f080d4133caddff6292295d4a586dadf5b678fbb98052e59a78ec2de42eaa928dc6def2de8a2a0800e086528c150111f1b80c171405eac0de
+  data.tar.gz: 4a41eff359089fd195b47408a64f0fa94805c1230fbf40d3cbf2001f76e8e465040d78f79f8186411c4fa46a90d979b21b3bae3796c5524f6f98833844be24c3

data/app/controllers/que/view/queue_metrics_controller.rb

@@ -19,7 +19,7 @@ module Que
         @queue_latencies =
           ::Que::View
             .fetch_queue_latencies(@queue_metrics.keys)
-            .transform_values { |value| current_time - value.to_time.to_i }
+            .transform_values { |value| value ? (current_time - value.to_time.to_i) : 0 }
       end
     end
   end

data/lib/que/view/dsl.rb

@@ -94,7 +94,7 @@ module Que
         <<-SQL.squish
           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 AND expired_at IS NULL)::int), 0) AS failing,
                  coalesce(sum((error_count = 0 AND locks.job_id IS NULL)::int), 0) AS scheduled,
                  coalesce(sum((finished_at IS NOT NULL)::int), 0) AS finished,
                  coalesce(sum((expired_at IS NOT NULL)::int), 0) AS expired
@@ -120,7 +120,7 @@ module Que
             CASE
             WHEN expired_at IS NOT NULL THEN 'expired'
             WHEN finished_at IS NOT NULL THEN 'finished'
-            WHEN locks.job_id IS NULL AND error_count > 0 THEN 'failing'
+            WHEN locks.job_id IS NULL AND error_count > 0 AND expired_at IS NULL THEN 'failing'
             WHEN locks.job_id IS NULL AND error_count = 0 THEN 'scheduled'
             ELSE 'running'
             END status
@@ -134,7 +134,7 @@ module Que
             CASE
             WHEN expired_at IS NOT NULL THEN 'expired'
             WHEN finished_at IS NOT NULL THEN 'finished'
-            WHEN locks.job_id IS NULL AND error_count > 0 THEN 'failing'
+            WHEN locks.job_id IS NULL AND error_count > 0 AND expired_at IS NULL THEN 'failing'
             WHEN locks.job_id IS NULL AND error_count = 0 THEN 'scheduled'
             ELSE 'running'
             END
@@ -174,6 +174,7 @@ module Que
         where_condition = <<-SQL.squish
           WHERE locks.job_id IS NULL
             AND error_count > 0
+            AND expired_at IS NULL
             #{search_condition(params)}
         SQL
         fetch_jobs_sql(per_page, offset, where_condition)

data/lib/que/view/version.rb

@@ -2,6 +2,6 @@
 
 module Que
   module View
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-view
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que