resque_admin-scheduler 1.1.6 → 1.1.7

data/lib/resque_admin/scheduler/server/views/delayed_schedules.erb

@@ -0,0 +1,20 @@
+<h1>Delayed jobs scheduled for <%= params[:klass] %> (<%= show_job_arguments(@args) %>)</h1>
+
+<table class='jobs'>
+<tr>
+  <th>Timestamp</th>
+</tr>
+
+<% @timestamps.each do |t| %>
+<tr>
+  <td>
+    <%= Time.at(t) %>
+  </td>
+</tr>
+<% end %>
+<% if @timestamps.empty? %>
+  <tr>
+    <td class='no-data'>There are no such jobs scheduled.</td>
+  </tr>
+<% end %>
+</table>

data/lib/resque_admin/scheduler/server/views/delayed_timestamp.erb

@@ -0,0 +1,26 @@
+<% timestamp = params[:timestamp].to_i %>
+
+<h1>Delayed jobs scheduled for <%= format_time(Time.at(timestamp)) %></h1>
+
+<p class='sub'>Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = resque_admin.delayed_timestamp_size(timestamp)%></b> jobs</p>
+
+<table class='jobs'>
+  <tr>
+    <th>Class</th>
+    <th>Args</th>
+  </tr>
+  <% jobs = resque_admin.delayed_timestamp_peek(timestamp, start, 20) %>
+  <% jobs.each do |job| %>
+    <tr>
+      <td class='class'><%= job['class'] %></td>
+      <td class='args'><%=h show_job_arguments(job['args']) %></td>
+    </tr>
+  <% end %>
+  <% if jobs.empty? %>
+    <tr>
+      <td class='no-data' colspan='2'>There are no pending jobs scheduled for this time.</td>
+    </tr>
+  <% end %>
+</table>
+
+<%= partial :next_more, :start => start, :size => size %>

data/lib/resque_admin/scheduler/server/views/requeue-params.erb

@@ -0,0 +1,23 @@
+<h1><%= @job_name %></h1>
+
+<p class='intro'>
+   This job requires parameters:
+</p>
+
+<form style="float:left" action="<%= u "/schedule/requeue_with_params" %>" method="post">
+  <table>
+  <% @parameters.each do |key, value| %>
+  <% value ||= {} %>
+    <tr>
+      <td>
+        <%= key %>
+        <% if value['description'] || value[:description] %>
+          <span style="border-bottom:1px dotted;" title="<%=value ['description'] || value[:description] %>">(?)</span>
+        <% end %>:
+      </td>
+      <td><input type="text" name="<%= key %>" value="<%= value['default'] || value[:default] %>"></td>
+  <% end %>
+  </table>
+  <input type="hidden" name="job_name" value="<%= @job_name %>">
+  <input type="submit" value="Queue now">
+</form>

data/lib/resque_admin/scheduler/server/views/scheduler.erb

@@ -0,0 +1,58 @@
+<h1>Schedule</h1>
+
+<p class='intro'>
+  The list below contains all scheduled jobs.  Click &quot;Queue now&quot; to queue
+  a job immediately.
+  <br/> Server local time: <%= Time.now %>
+  <br/> Server Environment: <%= ResqueAdmin::Scheduler.env %>
+  <br/> Current master: <%= ResqueAdmin.redis.get(ResqueAdmin::Scheduler.master_lock.key) %>
+</p>
+<p class='intro'>
+	The highlighted jobs are skipped for current environment.
+</p>
+<div style="overflow-y: auto; width:100%; padding: 0px 5px;">
+<table>
+  <tr>
+    <th>Index</th>
+    <% if ResqueAdmin::Scheduler.dynamic %>
+      <th></th>
+  <% end %>
+    <th></th>
+    <th>Name</th>
+    <th>Description</th>
+    <th>Interval</th>
+    <th>Class</th>
+    <th>Queue</th>
+    <th>Arguments</th>
+    <th>Last Enqueued</th>
+  </tr>
+  <% ResqueAdmin.schedule.keys.sort.each_with_index do |name, index| %>
+    <% config = ResqueAdmin.schedule[name] %>
+    <tr style="<%= scheduled_in_this_env?(name) ? '' : 'color: #9F6000;background: #FEEFB3;' %>">
+	    <td style="padding-left: 15px;"><%= index+ 1 %>.</td>
+      <% if ResqueAdmin::Scheduler.dynamic %>
+        <td style="padding-top: 12px; padding-bottom: 2px; width: 10px">
+          <form action="<%= u "/schedule" %>" method="post" style="margin-left: 0">
+            <input type="hidden" name="job_name" value="<%= h name %>">
+            <input type="hidden" name="_method" value="delete">
+            <input type="submit" value="Delete">
+          </form>
+        </td>
+      <% end %>
+      <td style="padding-top: 12px; padding-bottom: 2px; width: 10px">
+        <form action="<%= u "/schedule/requeue" %>" method="post" style="margin-left: 0">
+          <input type="hidden" name="job_name" value="<%= h name %>">
+          <input type="submit" value="Queue now">
+        </form>
+      </td>
+      <td><%= h name %></td>
+      <td><%= h config['description'] %></td>
+      <td style="white-space:nowrap"><%= h schedule_interval(config) %></td>
+      <td><%= h schedule_class(config) %></td>
+      <td><%= h config['queue'] || queue_from_class_name(config['class']) %></td>
+      <td><%= h show_job_arguments(config['args']) %></td>
+      <td><%= h ResqueAdmin.get_last_enqueued_at(name) || 'Never' %></td>
+    </tr>
+  <% end %>
+</table>
+</div>

data/lib/resque_admin/scheduler/server/views/search.erb

@@ -0,0 +1,72 @@
+<h1>Search Results</h1>
+<%= scheduler_view :search_form, layout: false %>
+<hr>
+<% delayed = @jobs.select { |j| j['where_at'] == 'delayed' } %>
+<h1>Delayed jobs</h1>
+<table class='jobs'>
+  <tr>
+    <th></th>
+    <th></th>
+    <th>Timestamp</th>
+    <th>Class</th>
+    <th>Args</th>
+  </tr>
+  <% delayed.each do |job| %>
+      <tr>
+        <td>
+          <form action="<%= u "/delayed/queue_now" %>" method="post">
+            <input type="hidden" name="timestamp" value="<%= job['timestamp'].to_i %>">
+            <input type="submit" value="Queue now">
+          </form>
+        </td>
+        <td>
+          <form action="<%= u "/delayed/cancel_now" %>" method="post">
+            <input type="hidden" name="timestamp" value="<%= job['timestamp'].to_i %>">
+            <input type="hidden" name="klass" value="<%= job['class'] %>">
+            <input type="hidden" name="args" value="<%= h(ResqueAdmin.encode job['args']) %>">
+            <input type="submit" value="Cancel Job">
+          </form>
+        </td>
+        <td class='args'><%= format_time(Time.at(job['timestamp'])) %></td>
+        <td class='class'><%= job['class'] %></td>
+        <td class='args'><%= h job['args'].inspect %></td>
+      </tr>
+  <% end %>
+</table>
+</h1>
+
+<% queued = @jobs.select { |j| j['where_at'] == 'queued' } %>
+<h1>Queued jobs</h1>
+<table class='jobs'>
+  <tr>
+    <th>Queue</th>
+    <th>Class</th>
+    <th>Args</th>
+  </tr>
+  <% queued.each do |job| %>
+  <tr>
+    <td class='class'><%= job['queue'] %></td>
+    <td class='class'><%= job['class'] %></td>
+    <td class='args'><%= h job['args'].inspect %></td>
+  </tr>
+  <% end %>
+</table>
+
+<% working = @jobs.select { |j| j['where_at'] == 'working' } %>
+<h1>Working jobs</h1>
+<table class='jobs'>
+  <tr>
+    <th>Queue</th>
+    <th>Class</th>
+    <th>Args</th>
+  </tr>
+  <% working.each do |job| %>
+  <tr>
+    <td class='class'><%= job['queue'] %></td>
+    <td class='class'><%= job['class'] %></td>
+    <td class='args'><%= h job['args'].inspect %></td>
+  </tr>
+  <% end %>
+</table>
+
+

data/lib/resque_admin/scheduler/server/views/search_form.erb

@@ -0,0 +1,8 @@
+<form method="POST" action="<%= u 'delayed/search' %>">
+  <input type='input' name='search' value="<%= params[:search] %>"/>
+  <input type='submit' value='Search'/>
+</form>
+
+
+
+

data/lib/resque_admin/scheduler/signal_handling.rb

@@ -0,0 +1,40 @@
+# vim:fileencoding=utf-8
+
+module ResqueAdmin
+  module Scheduler
+    module SignalHandling
+      attr_writer :signal_queue
+
+      def signal_queue
+        @signal_queue ||= []
+      end
+
+      # For all signals, set the shutdown flag and wait for current
+      # poll/enqueing to finish (should be almost instant).  In the
+      # case of sleeping, exit immediately.
+      def register_signal_handlers
+        (Signal.list.keys & %w(INT TERM USR1 USR2 QUIT)).each do |sig|
+          trap(sig) do
+            signal_queue << sig
+            # break sleep in the primary scheduler thread, alowing
+            # the signal queue to get processed as soon as possible.
+            @th.wakeup if @th && @th.alive?
+          end
+        end
+      end
+
+      def handle_signals
+        loop do
+          sig = signal_queue.shift
+          break unless sig
+          log! "Got #{sig} signal"
+          case sig
+          when 'INT', 'TERM', 'QUIT' then shutdown
+          when 'USR1' then print_schedule
+          when 'USR2' then reload_schedule!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resque_admin/scheduler/tasks.rb

@@ -0,0 +1,25 @@
+# vim:fileencoding=utf-8
+
+require 'resque_admin/tasks'
+require 'resque_admin-scheduler'
+
+namespace :resque_admin do
+  task :setup
+
+  def scheduler_cli
+    @scheduler_cli ||= ResqueAdmin::Scheduler::Cli.new(
+      %W(#{ENV['RESQUE_SCHEDULER_OPTIONS']})
+    )
+  end
+
+  desc 'Start ResqueAdmin Scheduler'
+  task scheduler: :scheduler_setup do
+    scheduler_cli.setup_env
+    scheduler_cli.run_forever
+  end
+
+  task :scheduler_setup do
+    scheduler_cli.parse_options
+    Rake::Task['resque_admin:setup'].invoke unless scheduler_cli.pre_setup
+  end
+end

data/lib/resque_admin/scheduler/util.rb

@@ -0,0 +1,39 @@
+# vim:fileencoding=utf-8
+
+module ResqueAdmin
+  module Scheduler
+    class Util
+      # In order to upgrade to resque_admin(1.25) which has deprecated following
+      # methods, we just added these usefull helpers back to use in ResqueAdmin
+      # Scheduler.  refer to:
+      # https://github.com/resque_admin/resque_admin-scheduler/pull/273
+
+      def self.constantize(camel_cased_word)
+        camel_cased_word = camel_cased_word.to_s
+
+        if camel_cased_word.include?('-')
+          camel_cased_word = classify(camel_cased_word)
+        end
+
+        names = camel_cased_word.split('::')
+        names.shift if names.empty? || names.first.empty?
+
+        constant = Object
+        names.each do |name|
+          args = Module.method(:const_get).arity != 1 ? [false] : []
+
+          constant = if constant.const_defined?(name, *args)
+                       constant.const_get(name)
+                     else
+                       constant.const_missing(name)
+                     end
+        end
+        constant
+      end
+
+      def self.classify(dashed_word)
+        dashed_word.split('-').map(&:capitalize).join
+      end
+    end
+  end
+end

data/lib/resque_admin/scheduler/version.rb

@@ -0,0 +1,7 @@
+# vim:fileencoding=utf-8
+
+module ResqueAdmin
+  module Scheduler
+    VERSION = '1.1.7'.freeze
+  end
+end

data/tasks/resque_admin_scheduler.rake

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'resque_admin/scheduler/tasks'

metadata

@@ -1,202 +1,140 @@
 --- !ruby/object:Gem::Specification
 name: resque_admin-scheduler
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
-- Ben VandenBos
-- Simon Eskildsen
-- Ryan Biesemeyer
-- Dan Buch
+- Chris Wanstrath
+- Steve Klabnik
+- Terence Lee
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
 date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: vegas
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.1.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.9.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: mono_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: tzinfo-data
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: |2
-      Light weight job scheduling on top of Resque.
-      Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
-      Also supports queueing jobs on a fixed, cron-like schedule.
-email:
-- bvandenbos@gmail.com
-- sirup@sirupsen.com
-- ryan@yaauie.com
-- dan@meatballhat.com
-executables: []
+      ResqueAdmin is a Redis-backed Ruby library for creating background jobs,
+      placing those jobs on multiple queues, and processing them later.
+
+      Background jobs can be any Ruby class or module that responds to
+      perform. Your existing classes can easily be converted to background
+      jobs or you can create new classes specifically to do work. Or, you
+      can do both.
+
+      ResqueAdmin is heavily inspired by DelayedJob (which rocks) and is
+      comprised of three parts:
+
+      * A Ruby library for creating, querying, and processing jobs
+      * A Rake task for starting a worker which processes jobs
+      * A Sinatra app for monitoring queues, jobs, and workers.
+email: steve@steveklabnik.com
+executables:
+- migrate_to_timestamps_set.rb
 extensions: []
 extra_rdoc_files: []
-files: []
-homepage: http://github.com/resque/resque-scheduler
-licenses:
-- MIT
+files:
+- bin/migrate_to_timestamps_set.rb
+- lib/resque_admin-scheduler.rb
+- lib/resque_admin/scheduler.rb
+- lib/resque_admin/scheduler/cli.rb
+- lib/resque_admin/scheduler/configuration.rb
+- lib/resque_admin/scheduler/delaying_extensions.rb
+- lib/resque_admin/scheduler/env.rb
+- lib/resque_admin/scheduler/extension.rb
+- lib/resque_admin/scheduler/failure_handler.rb
+- lib/resque_admin/scheduler/lock.rb
+- lib/resque_admin/scheduler/lock/base.rb
+- lib/resque_admin/scheduler/lock/basic.rb
+- lib/resque_admin/scheduler/lock/resilient.rb
+- lib/resque_admin/scheduler/locking.rb
+- lib/resque_admin/scheduler/logger_builder.rb
+- lib/resque_admin/scheduler/plugin.rb
+- lib/resque_admin/scheduler/scheduling_extensions.rb
+- lib/resque_admin/scheduler/server.rb
+- lib/resque_admin/scheduler/server/views/delayed.erb
+- lib/resque_admin/scheduler/server/views/delayed_schedules.erb
+- lib/resque_admin/scheduler/server/views/delayed_timestamp.erb
+- lib/resque_admin/scheduler/server/views/requeue-params.erb
+- lib/resque_admin/scheduler/server/views/scheduler.erb
+- lib/resque_admin/scheduler/server/views/search.erb
+- lib/resque_admin/scheduler/server/views/search_form.erb
+- lib/resque_admin/scheduler/signal_handling.rb
+- lib/resque_admin/scheduler/tasks.rb
+- lib/resque_admin/scheduler/util.rb
+- lib/resque_admin/scheduler/version.rb
+- tasks/resque_admin_scheduler.rake
+homepage: http://resque.github.io/
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -217,5 +155,5 @@ rubyforge_project:
 rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: Light weight job scheduling on top of Resque
+summary: ResqueAdmin is a Redis-backed queueing system.
 test_files: []