que-view 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b7b44890b63b063c130537e5fcc117f40bf1236dd89b156ca48e87a78d71248
-  data.tar.gz: 629fd230eb265fdbe7a41f0aec19e37f4047d797750eb635612687cceb7d5af9
+  metadata.gz: fcbc566936eae22f23cba44ed6908437fba07dbf621128895f4fe4e40319ad61
+  data.tar.gz: a7f2213f756286321699a96f10e1b69c1578e91dff46daa877c37db41898efde
 SHA512:
-  metadata.gz: 1412a8a378aaa977fd92b40c79dad153267cbf50d1e7ac7409380469106269e5b96484d12193ac57ee78187ad172e79a61783e54e0948aff9242e4947bf6d381
-  data.tar.gz: ac32754839e4105584d330cc34a19cb5fccb48f8ce60afd58c1c3f5bb9b933a7ab4bd8616e109d7a2a5b91b384dff878b4a5699ee576f5d5fa1822c60d4392b0
+  metadata.gz: 6250a8886b4d258f080d4133caddff6292295d4a586dadf5b678fbb98052e59a78ec2de42eaa928dc6def2de8a2a0800e086528c150111f1b80c171405eac0de
+  data.tar.gz: 4a41eff359089fd195b47408a64f0fa94805c1230fbf40d3cbf2001f76e8e465040d78f79f8186411c4fa46a90d979b21b3bae3796c5524f6f98833844be24c3

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

@@ -4,6 +4,7 @@ module Que
   module View
     class QueueMetricsController < Que::View::ApplicationController
       before_action :find_queue_metrics, only: %i[index]
+      before_action :find_queue_latencies, only: %i[index]
 
       def index; end
 
@@ -12,6 +13,14 @@ module Que
       def find_queue_metrics
         @queue_metrics = ::Que::View.fetch_queue_metrics
       end
+
+      def find_queue_latencies
+        current_time = DateTime.now.to_i
+        @queue_latencies =
+          ::Que::View
+            .fetch_queue_latencies(@queue_metrics.keys)
+            .transform_values { |value| value ? (current_time - value.to_time.to_i) : 0 }
+      end
     end
   end
 end

data/app/views/que/view/jobs/index.html.erb

@@ -7,7 +7,7 @@
     <%= form.submit 'Search', class: 'btn-primary' %>
   </div>
 <% end %>
-<% if @pagination %>
+<% if @pagination && @pagination.total_pages > 1 %>
   <div class="row pagination">
     <% if @pagination.previous_page? %>
       <%= link_to 'First', jobs_path(status: params[:status], page: 1), class: 'pagination-link' %>

data/app/views/que/view/jobs/show.html.erb

@@ -18,6 +18,10 @@
         <th>Priority</th>
         <td><%= @job[:priority] %></td>
       </tr>
+      <tr>
+        <th>Enqueued at</th>
+        <td><%= @job.dig(:args, 0, :enqueued_at).to_time.strftime("%Y-%m-%d %H:%M:%S") %></td>
+      </tr>
       <tr>
         <th>Run at</th>
         <td><%= @job[:run_at].strftime("%Y-%m-%d %H:%M:%S") %></td>

data/app/views/que/view/queue_metrics/index.html.erb

@@ -9,7 +9,7 @@
         <th>Running</th>
         <th>Finished</th>
         <th>Expired</th>
-        <th>Latency</th>
+        <th>Latency (seconds)</th>
       </tr>
     </thead>
     <tbody>
@@ -21,7 +21,7 @@
           <td><%= link_to values[:running], jobs_path(status: 'running', queue_name: queue) %></td>
           <td><%= link_to values[:finished], jobs_path(status: 'finished', queue_name: queue) %></td>
           <td><%= link_to values[:expired], jobs_path(status: 'expired', queue_name: queue) %></td>
-          <td></td>
+          <td><%= @queue_latencies[queue] %></td>
         </tr>
       <% end %>
     </tbody>

data/lib/que/view/dsl.rb

@@ -19,6 +19,10 @@ module Que
         }
       end
 
+      def fetch_queue_latencies(queue_names)
+        queue_names.index_with { |queue_name| execute(fetch_queue_oldest_job_sql(queue_name)).dig(0, :enqueued_at) }
+      end
+
       def fetch_queue_names
         execute(fetch_queue_names_sql).map { |queues_data|
           ["#{queues_data[:queue_name]} (#{queues_data[:count_all]})", queues_data[:queue_name]]
@@ -90,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
@@ -116,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
@@ -130,13 +134,25 @@ 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
         SQL
       end
 
+      def fetch_queue_oldest_job_sql(queue_name)
+        <<-SQL.squish
+          SELECT args #>> '{0, enqueued_at}' AS enqueued_at
+          FROM que_jobs
+          WHERE queue = '#{queue_name}'
+            AND expired_at IS NULL
+            AND finished_at IS NULL
+          ORDER BY args #>> '{0, enqueued_at}'
+          LIMIT 1
+        SQL
+      end
+
       def fetch_queue_names_sql
         <<-SQL.squish
           SELECT COUNT(*) AS count_all, queue AS queue_name
@@ -158,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.2'
+    VERSION = '0.3.4'
   end
 end

data/lib/que/view.rb

@@ -34,7 +34,7 @@ module Que
     end
 
     # Public: All the methods delegated to instance. These should match the interface of Que::View::DSL.
-    def_delegators :instance, :fetch_dashboard_stats, :fetch_que_lockers, :fetch_queue_metrics,
+    def_delegators :instance, :fetch_dashboard_stats, :fetch_que_lockers, :fetch_queue_metrics, :fetch_queue_latencies,
                    :fetch_queue_names, :fetch_job_names,
                    :fetch_running_jobs, :fetch_failing_jobs, :fetch_scheduled_jobs, :fetch_finished_jobs,
                    :fetch_expired_jobs, :fetch_job,

metadata

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