que-web 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8584792cba68d7f6e00a6e4852a676fff5620cb
-  data.tar.gz: eab83486882b4aed634b029f532083c054a437c2
+  metadata.gz: f5a47f1b59dd8d5fa25e4518fefc06e52a168cd6
+  data.tar.gz: 688a7ece0571223c6555980c6c2f8d5915e0ff32
 SHA512:
-  metadata.gz: 199fd0f8f74f1860ad539575a15f5625f73c49dba9f43a873354395c08d2689cdcecac05d1c530da475eab95b5053bc85060d517c8f87b4e9d9fc1c2cafad0a9
-  data.tar.gz: 4bdbe7d0e610f7f55893132f11decbaa4fda2f2bcaafd3ec394680ba6e1473cb78fef0447ab29e8e11332b430250365fe3fd0f157de89bc76f51c59b7a10219d
+  metadata.gz: 70385e07ff8aef1cddbb0174bed6011e12451a501820196e65fb3f86a977adf35cd564239c48fb0a716fc56909153e9a4c93acfcf9b49069120f548066d7beac
+  data.tar.gz: 9ee7f320ac3ab905389bb7d377106de5c04f84c8c7d1f15baf5c7ec7261efa61cbfbae5d3a0de9f4d37c5da37c961677fd5631e6f8a2624ae0ff5857cef09cee

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.7.0 - 2018-02-02
+#### Added:
+- Delete All and Reschedule All ([#39](https://github.com/statianzo/que-web/pull/39))
+
+#### Docs:
+- Upgrade vulnerable rack version in example
+
 ### 0.4.0 - 2015-04-09
 #### Added:
 - Indicate when a job is past due #2

data/README.md

@@ -4,11 +4,6 @@ que-web is a web UI to the [Que](https://github.com/chanks/que) job queue.
 
 ![Que Web](https://raw.githubusercontent.com/statianzo/que-web/master/doc/queweb.png)
 
-
-<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/AitzkUqcdsSnujfFtmVhTLXR/statianzo/que-web'>
-  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/AitzkUqcdsSnujfFtmVhTLXR/statianzo/que-web.svg' />
-</a>
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/examples/rack/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../../
+  remote: ../..
   specs:
-    que-web (0.3.2)
+    que-web (0.7.0)
       erubis
       que (~> 0.8)
       sinatra
@@ -10,17 +10,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     erubis (2.7.0)
-    pg (0.18.1)
-    que (0.9.1)
-    rack (1.6.0)
-    rack-protection (1.5.3)
+    mustermann (1.0.1)
+    pg (1.0.0)
+    que (0.14.2)
+    rack (2.0.4)
+    rack-protection (2.0.0)
       rack
-    sequel (4.19.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    tilt (1.4.1)
+    sequel (5.5.0)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
+    tilt (2.0.8)
 
 PLATFORMS
   ruby
@@ -29,3 +31,6 @@ DEPENDENCIES
   pg
   que-web!
   sequel
+
+BUNDLED WITH
+   1.15.3

data/lib/que/web.rb

@@ -76,6 +76,28 @@ module Que
       redirect request.referrer, 303
     end
 
+    put "/jobs" do
+      query = case params[:scope]
+      when 'scheduled'
+        SQL[:reschedule_all_scheduled_jobs]
+      when 'failing'
+        SQL[:reschedule_all_failing_jobs]
+      else
+        halt 400, "Unrecognized scope '#{params[:scope]}'. Valid scopes are: scheduled, failing"
+      end
+
+      run_at = Time.now
+      updated_rows = Que.execute query, [run_at]
+
+      if updated_rows.empty?
+        set_flash "warning", "No jobs rescheduled"
+      else
+        set_flash "info", "#{updated_rows.count} jobs rescheduled for #{run_at}"
+      end
+
+      redirect request.referrer, 303
+    end
+
     delete "/jobs/:id" do |id|
       job_id = id.to_i
       if job_id > 0
@@ -92,6 +114,27 @@ module Que
       redirect request.referrer, 303
     end
 
+    delete "/jobs" do
+      query = case params[:scope]
+      when 'scheduled'
+          SQL[:delete_all_scheduled_jobs]
+      when 'failing'
+        SQL[:delete_all_failing_jobs]
+      else
+        halt 400, "Unrecognized scope '#{params[:scope]}'. Valid scopes are: scheduled, failing"
+      end
+
+      updated_rows = Que.execute query
+
+      if updated_rows.empty?
+        set_flash "warning", "No jobs deleted"
+      else
+        set_flash "info", "#{updated_rows.count} jobs deleted"
+      end
+
+      redirect request.referrer, 303
+    end
+
     def get_pager(record_count)
       page = (params[:page] || 1).to_i
       Pager.new(page, PAGE_SIZE, record_count)

data/lib/que/web/sql.rb

@@ -4,6 +4,41 @@ lock_job_sql = <<-SQL.freeze
     WHERE job_id = $1::bigint
 SQL
 
+lock_all_failing_jobs_sql = <<-SQL.freeze
+    SELECT job_id, pg_try_advisory_lock(job_id) AS locked
+    FROM que_jobs
+    WHERE error_count > 0
+SQL
+
+lock_all_scheduled_jobs_sql = <<-SQL.freeze
+    SELECT job_id, pg_try_advisory_lock(job_id) AS locked
+    FROM que_jobs
+    WHERE error_count = 0
+SQL
+
+def reschedule_all_jobs_query(scope)
+  <<-SQL.freeze
+    WITH target AS (#{scope})
+    UPDATE que_jobs
+    SET run_at = $1::timestamptz
+    FROM target
+    WHERE target.locked
+    AND target.job_id = que_jobs.job_id
+    RETURNING pg_advisory_unlock(target.job_id)
+  SQL
+end
+
+def delete_jobs_query(scope)
+  <<-SQL.freeze
+    WITH target AS (#{scope})
+    DELETE FROM que_jobs
+    USING target
+    WHERE target.locked
+    AND target.job_id = que_jobs.job_id
+    RETURNING pg_advisory_unlock(target.job_id)
+  SQL
+end
+
 Que::Web::SQL = {
   dashboard_stats: <<-SQL.freeze,
     SELECT count(*)                    AS total,
@@ -45,14 +80,9 @@ Que::Web::SQL = {
     LIMIT $1::int
     OFFSET $2::int
   SQL
-  delete_job: <<-SQL.freeze,
-    WITH target AS (#{lock_job_sql})
-    DELETE FROM que_jobs
-    USING target
-    WHERE target.locked
-    AND target.job_id = que_jobs.job_id
-    RETURNING pg_advisory_unlock(target.job_id)
-  SQL
+  delete_job: delete_jobs_query(lock_job_sql),
+  delete_all_scheduled_jobs: delete_jobs_query(lock_all_scheduled_jobs_sql),
+  delete_all_failing_jobs: delete_jobs_query(lock_all_failing_jobs_sql),
   reschedule_job: <<-SQL.freeze,
     WITH target AS (#{lock_job_sql})
     UPDATE que_jobs
@@ -62,6 +92,8 @@ Que::Web::SQL = {
     AND target.job_id = que_jobs.job_id
     RETURNING pg_advisory_unlock(target.job_id)
   SQL
+  reschedule_all_scheduled_jobs: reschedule_all_jobs_query(lock_all_scheduled_jobs_sql),
+  reschedule_all_failing_jobs: reschedule_all_jobs_query(lock_all_failing_jobs_sql),
   fetch_job: <<-SQL.freeze,
     SELECT *
     FROM que_jobs

data/que-web.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "que-web"
-  spec.version       = "0.6.3"
+  spec.version       = "0.7.0"
   spec.authors       = ["Jason Staten"]
   spec.email         = ["jstaten07@gmail.com"]
   spec.summary       = %q{A web interface for the que queue}

data/web/public/styles/application.css

@@ -40,6 +40,7 @@
 .dashboard-value {
   font-size: 5em;
   line-height: 1em;
+  color: black;
 }
 
 table {
@@ -75,3 +76,7 @@ i.subtle {
 .search {
   margin-top: 15px;
 }
+
+.pagination {
+  margin-top: 10px;
+}

data/web/views/failing.erb

@@ -53,7 +53,24 @@
   </div>
 </div>
 <div class="row">
-  <div class="small-12 columns">
+  <div class="small-8 columns">
     <%== erb :_pager %>
   </div>
+  <% if @list.total > 0 %>
+    <div class="small-4 columns text-right">
+      <form action="<%= link_to "jobs" %>" method="post" class="form-inline"
+            onsubmit="return confirm('Retry all <%= @list.total %> jobs?');">
+        <input type="hidden" name="_method" value="put" />
+        <input type="hidden" name="scope" value="failing" />
+        <button class="button small" title="Retry All Immediately"><i class="fa fa-refresh"></i> Retry All</button>
+      </form>
+      &nbsp;
+      <form action="<%= link_to "jobs" %>" method="post" class="form-inline"
+            onsubmit="return confirm('Delete all <%= @list.total %> jobs?');">
+        <input type="hidden" name="_method" value="delete" />
+        <input type="hidden" name="scope" value="failing" />
+        <button class="button small alert" title="Delete All"><i class="fa fa-trash"></i> Delete All</button>
+      </form>
+    </div>
+  <% end %>
 </div>

data/web/views/index.erb

@@ -10,7 +10,7 @@
   <a class="small-12 large-4 columns" href="<%= link_to 'running' %>">
     <div class="dashboard-stat running">
       <div class="cell">
-        <h2>Running<h2>
+        <h2>Running</h2>
         <span class="dashboard-value">
           <%= @dashboard.running %>
         </span>
@@ -20,7 +20,7 @@
   <a class="small-12 large-4 columns" href="<%= link_to 'scheduled' %>">
     <div class="dashboard-stat scheduled">
       <div class="cell">
-        <h2>Scheduled<h2>
+        <h2>Scheduled</h2>
         <span class="dashboard-value">
           <%= @dashboard.scheduled %>
         </span>
@@ -30,7 +30,7 @@
   <a class="small-12 large-4 columns" href="<%= link_to 'failing' %>">
     <div class="dashboard-stat failing">
       <div class="cell">
-        <h2>Failing<h2>
+        <h2>Failing</h2>
         <span class="dashboard-value">
           <%= @dashboard.failing %>
         </span>

data/web/views/scheduled.erb

@@ -48,7 +48,24 @@
   </div>
 </div>
 <div class="row">
-  <div class="small-12 columns">
+  <div class="small-8 columns">
     <%== erb :_pager %>
   </div>
+  <% if @list.total > 0 %>
+    <div class="small-4 columns text-right">
+      <form action="<%= link_to "jobs" %>" method="post" class="form-inline"
+            onsubmit="return confirm('Run all <%= @list.total %> jobs now?');">
+        <input type="hidden" name="_method" value="put" />
+        <input type="hidden" name="scope" value="scheduled" />
+        <button class="button small" title="Run All Immediately"><i class="fa fa-play-circle"></i> Run All</button>
+      </form>
+      &nbsp;
+      <form action="<%= link_to "jobs" %>" method="post" class="form-inline"
+            onsubmit="return confirm('Delete all <%= @list.total %> jobs?');">
+        <input type="hidden" name="_method" value="delete" />
+        <input type="hidden" name="scope" value="scheduled" />
+        <button class="button small alert" title="Delete All"><i class="fa fa-trash"></i> Delete All</button>
+      </form>
+    </div>
+  <% end %>
 </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-web
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Jason Staten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A web interface for the que queue