sidekiq-cron 0.6.3 → 1.2.0

data/lib/sidekiq/cron/launcher.rb

@@ -1,6 +1,3 @@
-# require  Sidekiq original launcher
-require 'sidekiq/launcher'
-
 # require cron poller
 require 'sidekiq/cron/poller'
 
@@ -10,44 +7,41 @@ require 'sidekiq/cron/poller'
 # we are creating new cron poller instance and
 # adding start and stop commands to launcher
 module Sidekiq
-  class Launcher
-    # Add cron poller to launcher
-    attr_reader :cron_poller
-
-    # remember old initialize
-    alias_method :old_initialize, :initialize
-
-    # add cron poller and execute normal initialize of Sidekiq launcher
-    def initialize(options)
-      @cron_poller = Sidekiq::Cron::Poller.new
-      old_initialize options
-    end
-
-    # remember old run
-    alias_method :old_run, :run
-
-    # execute normal run of launcher and run cron poller
-    def run
-      old_run
-      cron_poller.start
-    end
-
-    # remember old quiet
-    alias_method :old_quiet, :quiet
-
-    # execute normal quiet of launcher and quiet cron poller
-    def quiet
-      cron_poller.terminate
-      old_quiet
+  module Cron
+    module Launcher
+      # Add cron poller to launcher
+      attr_reader :cron_poller
+
+      # add cron poller and execute normal initialize of Sidekiq launcher
+      def initialize(options)
+        @cron_poller = Sidekiq::Cron::Poller.new
+        super(options)
+      end
+
+      # execute normal run of launcher and run cron poller
+      def run
+        super
+        cron_poller.start
+      end
+
+      # execute normal quiet of launcher and quiet cron poller
+      def quiet
+        cron_poller.terminate
+        super
+      end
+
+      # execute normal stop of launcher and stop cron poller
+      def stop
+        cron_poller.terminate
+        super
+      end
     end
+  end
+end
 
-    # remember old stop
-    alias_method :old_stop, :stop
+Sidekiq.configure_server do
+  # require  Sidekiq original launcher
+  require 'sidekiq/launcher'
 
-    # execute normal stop of launcher and stop cron poller
-    def stop
-      cron_poller.terminate
-      old_stop
-    end
-  end
+  ::Sidekiq::Launcher.prepend(Sidekiq::Cron::Launcher)
 end

data/lib/sidekiq/cron/locales/de.yml

@@ -5,9 +5,9 @@ de:
   EnqueueNow: In Warteschlange
   'Cron string': Cron
   AreYouSureDeleteCronJob: Sind Sie sicher, dass sie den Cronjob %{job} löschen wollen?
-  NoCronJobsFound: "Keine Cronjobs gefunden"
+  NoCronJobsWereFound: Keine Cronjobs gefunden
   Enable: Aktivieren
   Disable: Deaktivieren
-  'Last enque': Eingereiht
+  'Last enqueued': Eingereiht
   disabled: deaktiviert
   enabled: aktiviert

data/lib/sidekiq/cron/locales/en.yml

@@ -10,9 +10,11 @@ en:
   'Cron string': Cron
   AreYouSureDeleteCronJobs: Are you sure you want to delete ALL cron jobs?
   AreYouSureDeleteCronJob: Are you sure you want to delete the %{job} cron job?
-  NoCronJobsFound: "No cron jobs found"
+  NoCronJobsWereFound: No cron jobs were found
   Enable: Enable
   Disable: Disable
-  'Last enque': Last enqueued
+  'Last enqueued': Last enqueued
   disabled: disabled
   enabled: enabled
+  NoHistoryWereFound: No history were found
+  Description: Description

data/lib/sidekiq/cron/locales/ja.yml

@@ -0,0 +1,18 @@
+ja:
+  Job: ジョブ
+  Cron: Cron
+  CronJobs: Cronジョブ
+  EnqueueNow: すぐにキューに入れる
+  EnableAll: すべて有効にする
+  DisableAll: すべて無効にする
+  EnqueueAll: すべてキューに入れる
+  DeleteAll: すべて削除
+  'Cron string': Cron
+  AreYouSureDeleteCronJobs: 本当にすべてのcronジョブを削除しますか？
+  AreYouSureDeleteCronJob: 本当に%{job}のcronジョブを削除しますか？
+  NoCronJobsWereFound: Cronジョブが見つかりませんでした
+  Enable: 有効にする
+  Disable: 無効にする
+  'Last enqueued': 最後のキュー
+  disabled: 無効
+  enabled: 有効

data/lib/sidekiq/cron/locales/ru.yml

@@ -6,9 +6,9 @@ ru:
   'Cron string': Периодичность (синтаксис Cron)
   EnqueueNow: Запустить
   AreYouSureDeleteCronJob: Вы действительно хотите удалить задачу «%{job}»?
-  NoCronJobsFound: "Не найдено периодических задач"
+  NoCronJobsWereFound: Не найдено периодических задач
   Enable: Включить
   Disable: Отключить
-  'Last enque': Последний запуск
+  'Last enqueued': Последний запуск
   disabled: отключено
   enabled: включено

data/lib/sidekiq/cron/locales/zh-CN.yml

@@ -0,0 +1,19 @@
+zh-CN:
+  Job: 任务
+  Cron: 定时任务
+  CronJobs: 定时任务列表
+  EnqueueNow: 立刻执行
+  EnableAll: 启用所有
+  DisableAll: 禁用所有
+  EnqueueAll: 执行所有
+  DeleteAll: 删除所有
+  'Cron string': 定时策略
+  AreYouSureDeleteCronJobs: 你确定删除所有的定时任务吗？
+  AreYouSureDeleteCronJob: 你确定删除定时任务（%{job}）吗？
+  NoCronJobsWereFound: 没有定时任务
+  Enable: 启用
+  Disable: 禁用
+  'Last enqueued': 放入队列时间
+  disabled: 已禁用
+  enabled: 已启用
+

data/lib/sidekiq/cron/poller.rb

@@ -17,8 +17,9 @@ module Sidekiq
       rescue => ex
         # Most likely a problem with redis networking.
         # Punt and try again at the next interval
-        logger.error ex.message
-        logger.error ex.backtrace.first
+        Sidekiq.logger.error ex.message
+        Sidekiq.logger.error ex.backtrace.first
+        handle_exception(ex) if respond_to?(:handle_exception)
       end
 
       private
@@ -27,8 +28,9 @@ module Sidekiq
         job.test_and_enque_for_time! time if job && job.valid?
       rescue => ex
         # problem somewhere in one job
-        logger.error "CRON JOB: #{ex.message}"
-        logger.error "CRON JOB: #{ex.backtrace.first}"
+        Sidekiq.logger.error "CRON JOB: #{ex.message}"
+        Sidekiq.logger.error "CRON JOB: #{ex.backtrace.first}"
+        handle_exception(ex) if respond_to?(:handle_exception)
       end
 
       def poll_interval_average

data/lib/sidekiq/cron/views/cron.erb

@@ -3,22 +3,24 @@
     <h3><%=t 'CronJobs' %></h3>
   </div>
   <div class='col-sm-7 pull-right' style="margin-top: 20px; margin-bottom: 10px;">
-    <form action="<%= root_path %>cron/__all__/delete" method="post" class="pull-right">
-      <%= csrf_tag if respond_to?(:csrf_tag) %>
-      <input class="btn btn-small btn-danger" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSureDeleteCronJobs') %>">
-    </form>
-    <form action="<%= root_path %>cron/__all__/disable" method="post" class="pull-right">
-      <%= csrf_tag if respond_to?(:csrf_tag) %>
-      <input class="btn btn-small" type="submit" name="enque" value="<%= t('DisableAll') %>" />
-    </form>
-    <form action="<%= root_path %>cron/__all__/enable" method="post" class="pull-right">
-      <%= csrf_tag if respond_to?(:csrf_tag) %>
-      <input class="btn btn-small" type="submit" name="enque" value="<%= t('EnableAll') %>" />
-    </form>
-    <form action="<%= root_path %>cron/__all__/enque" method="post" class="pull-right">
-      <%= csrf_tag if respond_to?(:csrf_tag) %>
-      <input class="btn btn-small" type="submit" name="enque" value="<%= t('EnqueueAll') %>" />
-    </form>
+    <% if @cron_jobs.size > 0 %>
+      <form action="<%= root_path %>cron/__all__/delete" method="post" class="pull-right">
+        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <input class="btn btn-small btn-danger" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSureDeleteCronJobs') %>">
+      </form>
+      <form action="<%= root_path %>cron/__all__/disable" method="post" class="pull-right">
+        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <input class="btn btn-small" type="submit" name="enque" value="<%= t('DisableAll') %>" />
+      </form>
+      <form action="<%= root_path %>cron/__all__/enable" method="post" class="pull-right">
+        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <input class="btn btn-small" type="submit" name="enque" value="<%= t('EnableAll') %>" />
+      </form>
+      <form action="<%= root_path %>cron/__all__/enque" method="post" class="pull-right">
+        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <input class="btn btn-small" type="submit" name="enque" value="<%= t('EnqueueAll') %>" />
+      </form>
+    <% end %>
   </div>
 </header>
 
@@ -29,7 +31,7 @@
       <th><%= t('Status') %></th>
       <th><%= t('Name') %></th>
       <th><%= t('Cron string') %></th>
-      <th><%= t('Last enque') %></th>
+      <th><%= t('Last enqueued') %></th>
       <th width="180"><%= t('Actions')%></th>
     </thead>
 
@@ -39,7 +41,9 @@
         <tr>
           <td style="<%= style %>"><%= t job.status %></td>
           <td style="<%= style %>">
-            <b><%= job.name %></b>
+            <a href="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>">
+              <b><%= job.name %></b>
+            </a>
             <hr style="margin:3px;border:0;">
             <small>
             <% if job.message and job.message.to_s.size > 100 %>
@@ -83,6 +87,6 @@
     </tbody>
   </table>
 <% else %>
-  <span class='alert alert-success'><%= t('NoCronJobsFound') %></span>
+  <div class='alert alert-success'><%= t('NoCronJobsWereFound') %></div>
 <% end %>
 

data/lib/sidekiq/cron/views/cron.slim

@@ -3,18 +3,19 @@ header.row
     h3 = t('CronJobs')
 
   .span.col-sm-7.pull-right style="margin-top: 20px; margin-bottom: 10px;"
-    form.pull-right action="#{root_path}cron/__all__/delete" method="post"
-      = csrf_tag if respond_to?(:csrf_tag)
-      input.btn.btn-small.pull-left.btn-danger type="submit" name="enque" value="#{t('DeleteAll')}" data-confirm="#{t('AreYouSureDeleteCronJobs')}"
-    form.pull-right action="#{root_path}cron/__all__/disable" method="post"
-      = csrf_tag if respond_to?(:csrf_tag)
-      input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('DisableAll')}"
-    form.pull-right action="#{root_path}cron/__all__/enable" method="post"
-      = csrf_tag if respond_to?(:csrf_tag)
-      input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnableAll')}"
-    form.pull-right action="#{root_path}cron/__all__/enque" method="post"
-      = csrf_tag if respond_to?(:csrf_tag)
-      input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueAll')}"
+    - if @cron_jobs.size > 0
+      form.pull-right action="#{root_path}cron/__all__/delete" method="post"
+        = csrf_tag if respond_to?(:csrf_tag)
+        input.btn.btn-small.pull-left.btn-danger type="submit" name="enque" value="#{t('DeleteAll')}" data-confirm="#{t('AreYouSureDeleteCronJobs')}"
+      form.pull-right action="#{root_path}cron/__all__/disable" method="post"
+        = csrf_tag if respond_to?(:csrf_tag)
+        input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('DisableAll')}"
+      form.pull-right action="#{root_path}cron/__all__/enable" method="post"
+        = csrf_tag if respond_to?(:csrf_tag)
+        input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnableAll')}"
+      form.pull-right action="#{root_path}cron/__all__/enque" method="post"
+        = csrf_tag if respond_to?(:csrf_tag)
+        input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueAll')}"
 
 - if @cron_jobs.size > 0
 
@@ -23,7 +24,7 @@ header.row
       th = t('Status')
       th = t('Name')
       th = t('Cron')
-      th = t('Last enque')
+      th = t('Last enqueued')
       th width="180px"
         = t('Actions')
 
@@ -33,7 +34,8 @@ header.row
       tr
         td[style="#{style}"]= job.status
         td[style="#{style}"]
-          b job.name
+          a href="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}"
+            b = job.name
           hr style="margin:3px;border:0;"
           small
             - if job.message and job.message.to_s.size > 100
@@ -66,4 +68,4 @@ header.row
               input.btn.btn-danger.btn-small type="submit" name="delete" value="#{t('Delete')}" data-confirm="#{t('AreYouSureDeleteCronJob', :job => job.name)}"
 
 - else
-  .alert.alert-success = t('NoCronJobsFound')
+  .alert.alert-success = t('NoCronJobsWereFound')

data/lib/sidekiq/cron/views/cron_show.erb

@@ -0,0 +1,88 @@
+<header class="row">
+  <div class="span col-sm-5 pull-left">
+    <h3>
+      <%= "#{t('Cron')} #{t('Job')}" %>
+      <small><%= @job.name %></small>
+    </h3>
+  </div>
+  <div class="span col-sm-7 pull-right" style="margin-top: 20px; margin-bottom: 10px;">
+    <% cron_job_path = "#{root_path}cron/#{CGI.escape(@job.name).gsub('+', '%20')}" %>
+    <form action="<%= cron_job_path %>/enque?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+      <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <input class="btn btn-small pull-left" name="enque" type="submit" value="<%= t('EnqueueNow') %>" />
+    </form>
+    <% if @job.status == 'enabled' %>
+      <form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <input class="btn btn-small pull-left" name="disable" type="submit" value="<%= t('Disable') %>" />
+      </form>
+    <% else %>
+      <form action="<%= cron_job_path %>/enable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <input class="btn btn-small pull-left" name="enable" type="submit" value="<%= t('Enable') %>" />
+      </form>
+      <form action="<%= cron_job_path %>/delete" class="pull-right" method="post">
+        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <input class="btn btn-danger btn-small" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => @job.name) %>" name="delete" type="submit" value="<%= t('Delete') %>" />
+      </form>
+    <% end %>
+  </div>
+</header>
+
+<table class="table table-bordered table-striped">
+  <tbody>
+  <tr>
+    <th><%= t 'Status' %></th>
+    <td><%= @job.status %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Name' %></th>
+    <td><%= @job.name %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Description' %></th>
+    <td><%= @job.description %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Message' %></th>
+    <td><pre><%= @job.pretty_message %></pre></td>
+  </tr>
+  <tr>
+    <th><%= t 'Cron' %></th>
+    <td><%= @job.cron.gsub(" ", "&nbsp;") %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Last enqueued' %></th>
+    <td><%= @job.last_enqueue_time ? relative_time(@job.last_enqueue_time) : "-" %></td>
+  </tr>
+  </tbody>
+</table>
+
+<header class="row">
+  <div class="col-sm-12">
+    <h4>
+      <%= t 'History' %>
+    </h4>
+  </div>
+</header>
+
+<% if @job.jid_history_from_redis.size > 0 %>
+  <table class="table table-hover table-bordered table-striped">
+    <thead>
+    <tr>
+      <th><%= t 'Enqueued' %></th>
+      <th><%= t 'JID' %></th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @job.jid_history_from_redis.each do |jid_history| %>
+      <tr>
+        <td><%= jid_history['enqueued'] %></td>
+        <td><%= jid_history['jid'] %></td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class='alert alert-success'><%= t 'NoHistoryWereFound' %></div>
+<% end %>

data/lib/sidekiq/cron/views/cron_show.slim

@@ -0,0 +1,61 @@
+header.row
+  .span.col-sm-5.pull-left
+    h3
+      = "#{t('Cron')} #{t('Job')}"
+      small= @job.name
+  .span.col-sm-7.pull-right style=("margin-top: 20px; margin-bottom: 10px;")
+    - cron_job_path = "#{root_path}cron/#{CGI.escape(@job.name).gsub('+', '%20')}"
+    form.pull-right action="#{cron_job_path}/enque?redirect=#{cron_job_path}" method="post"
+      = csrf_tag if respond_to?(:csrf_tag)
+      input.btn.btn-small.pull-left name="enque" type="submit" value="#{t('EnqueueNow')}"
+    - if @job.status == 'enabled'
+      form.pull-right action="#{cron_job_path}/disable?redirect=#{cron_job_path}" method="post"
+        = csrf_tag if respond_to?(:csrf_tag)
+        input.btn.btn-small.pull-left name="disable" type="submit" value="#{t('Disable')}"
+    - else
+      form.pull-right action="#{cron_job_path}/enable?redirect=#{cron_job_path}" method="post"
+        = csrf_tag if respond_to?(:csrf_tag)
+        input.btn.btn-small.pull-left name="enable" type="submit" value="#{t('Enable')}"
+      form.pull-right action="#{cron_job_path}/delete" method="post"
+        = csrf_tag if respond_to?(:csrf_tag)
+        input.btn.btn-danger.btn-small data-confirm="#{t('AreYouSureDeleteCronJob' job =@job.name)}" name="delete" type="submit" value="#{t('Delete')}" /
+
+table.table.table-bordered.table-striped
+  tbody
+    tr
+      th= t 'Status'
+      td= @job.status
+    tr
+      th= t 'Name'
+      td= @job.name
+    tr
+      th= t 'Description'
+      td= @job.description
+    tr
+      th= t 'Message'
+      td
+        pre= @job.pretty_message
+    tr
+      th= t 'Cron'
+      td= @job.cron.gsub(" ", " ")
+    tr
+      th= t 'Last enqueued'
+      td= @job.last_enqueue_time ? relative_time(@job.last_enqueue_time) : "-"
+
+header.row
+  .col-sm-12
+    h4= t 'History'
+
+- if @job.jid_history_from_redis.size > 0
+  table.table.table-hover.table-bordered.table-striped
+    thead
+      tr
+        th= t 'Enqueued'
+        th= t 'JID'
+    tbody
+      - @job.jid_history_from_redis.each do |jid_history|
+        tr
+          td= jid_history['enqueued']
+          td= jid_history['jid']
+- else
+  .alert.alert-success= t 'NoHistoryWereFound'