sidekiq 6.4.0 → 6.5.1

data/web/assets/javascripts/application.js

@@ -9,7 +9,9 @@ var ready = (callback) => {
   else document.addEventListener("DOMContentLoaded", callback);
 }
 
-ready(() => {
+ready(addListeners)
+
+function addListeners() {
   document.querySelectorAll(".check_all").forEach(node => {
     node.addEventListener("click", event => {
       node.closest('table').querySelectorAll('input[type=checkbox]').forEach(inp => { inp.checked = !!node.checked; });
@@ -26,42 +28,48 @@ ready(() => {
   })
 
   document.querySelectorAll("[data-toggle]").forEach(node => {
-    node.addEventListener("click", event => {
-      var targName = node.getAttribute("data-toggle");
-      var full = document.getElementById(targName + "_full");
-      if (full.style.display == "block") {
-        full.style.display = 'none';
-      } else {
-        full.style.display = 'block';
-      }
-    })
+    node.addEventListener("click", addDataToggleListeners)
   })
 
   updateFuzzyTimes();
+  setLivePollFromUrl();
 
   var buttons = document.querySelectorAll(".live-poll");
   if (buttons.length > 0) {
     buttons.forEach(node => {
-      node.addEventListener("click", event => {
-        if (localStorage.sidekiqLivePoll == "enabled") {
-          localStorage.sidekiqLivePoll = "disabled";
-          clearTimeout(livePollTimer);
-          livePollTimer = null;
-        } else {
-          localStorage.sidekiqLivePoll = "enabled";
-          livePollCallback();
-        }
-
-        updateLivePollButton();
-      })
+      node.addEventListener("click", addPollingListeners)
     });
 
     updateLivePollButton();
-    if (localStorage.sidekiqLivePoll == "enabled") {
+    if (localStorage.sidekiqLivePoll == "enabled" && !livePollTimer) {
       scheduleLivePoll();
     }
   }
-})
+}
+
+function addPollingListeners(_event)  {
+  if (localStorage.sidekiqLivePoll == "enabled") {
+    localStorage.sidekiqLivePoll = "disabled";
+    clearTimeout(livePollTimer);
+    livePollTimer = null;
+  } else {
+    localStorage.sidekiqLivePoll = "enabled";
+    livePollCallback();
+  }
+
+  updateLivePollButton();
+}
+
+function addDataToggleListeners(event) {
+  var source = event.target || event.srcElement;
+  var targName = source.getAttribute("data-toggle");
+  var full = document.getElementById(targName + "_full");
+  if (full.style.display == "block") {
+    full.style.display = 'none';
+  } else {
+    full.style.display = 'block';
+  }
+}
 
 function updateFuzzyTimes() {
   var locale = document.body.getAttribute("data-locale");
@@ -76,6 +84,14 @@ function updateFuzzyTimes() {
   t.cancel();
 }
 
+function setLivePollFromUrl() {
+  var url_params = new URL(window.location.href).searchParams
+
+  if (url_params.get("poll") == "true") {
+    localStorage.sidekiqLivePoll = "enabled";
+  }
+}
+
 function updateLivePollButton() {
   if (localStorage.sidekiqLivePoll == "enabled") {
     document.querySelectorAll('.live-poll-stop').forEach(box => { box.style.display = "inline-block" })
@@ -89,7 +105,19 @@ function updateLivePollButton() {
 function livePollCallback() {
   clearTimeout(livePollTimer);
 
-  fetch(window.location.href).then(resp => resp.text()).then(replacePage).finally(scheduleLivePoll)
+  fetch(window.location.href)
+  .then(checkResponse)
+  .then(resp => resp.text())
+  .then(replacePage)
+  .catch(showError)
+  .finally(scheduleLivePoll)
+}
+
+function checkResponse(resp) {
+  if (!resp.ok) {
+    throw response.error();
+  }
+  return resp
 }
 
 function scheduleLivePoll() {
@@ -107,5 +135,9 @@ function replacePage(text) {
   var header_status = doc.querySelector('.status')
   document.querySelector('.status').replaceWith(header_status)
 
-  updateFuzzyTimes();
+  addListeners();
+}
+
+function showError(error) {
+  console.error(error)
 }

data/web/assets/stylesheets/application.css

@@ -202,6 +202,7 @@ table .table-checkbox label {
 
 .navbar .navbar-brand .status {
   color: #585454;
+  display: inline;
 }
 
 

data/web/locales/pt-br.yml

@@ -8,6 +8,7 @@
   History: Histórico
   Busy: Ocupados
   Processed: Processados
+  Utilization: Utilização
   Failed: Falhas
   Scheduled: Agendados
   Retries: Tentativas
@@ -26,18 +27,20 @@
   Delete: Apagar
   AddToQueue: Adicionar à fila
   AreYouSureDeleteJob: Deseja deletar esta tarefa?
-  AreYouSureDeleteQueue: Deseja deletar a %{queue} fila?
+  AreYouSureDeleteQueue: Deseja deletar a fila %{queue}? Isso irá deletar todas as tarefas desta fila.
   Queues: Filas
   Size: Tamanho
   Actions: Ações
   NextRetry: Próxima Tentativa
   RetryCount: Número de Tentativas
   RetryNow: Tentar novamente agora
+  Kill: Matar
   LastRetry: Última tentativa
   OriginallyFailed: Falhou originalmente
   AreYouSure: Tem certeza?
   DeleteAll: Apagar tudo
   RetryAll: Tentar tudo novamente
+  KillAll: Matar todas
   NoRetriesFound: Nenhuma tentativa encontrada
   Error: Erro
   ErrorClass: Classe de erro
@@ -58,11 +61,26 @@
   OneMonth: 1 mês
   ThreeMonths: 3 meses
   SixMonths: 6 meses
-  Failures : Falhas
-  DeadJobs : Tarefas mortas
-  NoDeadJobsFound : Nenhuma tarefa morta foi encontrada
-  Dead : Morta
-  Processes : Processos
-  Thread : Thread
-  Threads : Threads
-  Jobs : Tarefas
+  Failures: Falhas
+  DeadJobs: Tarefas mortas
+  NoDeadJobsFound: Nenhuma tarefa morta foi encontrada
+  Dead: Morta
+  Process: Processo
+  Processes: Processos
+  Name: Nome
+  Thread: Thread
+  Threads: Threads
+  Jobs: Tarefas
+  Paused: Pausado
+  Stop: Parar
+  Quiet: Silenciar
+  StopAll: Parar Todos
+  QuietAll: Silenciar Todos
+  PollingInterval: Intervalo de Polling
+  Plugins: Plug-ins
+  NotYetEnqueued: Ainda não enfileirado
+  CreatedAt: Criado em
+  BackToApp: De volta ao aplicativo
+  Latency: Latência
+  Pause: Pausar
+  Unpause: Despausar

data/web/views/_summary.erb

@@ -9,7 +9,7 @@
   </li>
   <li class="busy col-sm-1">
     <a href="<%= root_path %>busy">
-      <span id="txtBusy" class="count"><%= number_with_delimiter(workers.size) %></span>
+      <span id="txtBusy" class="count"><%= number_with_delimiter(workset.size) %></span>
       <span class="desc"><%= t('Busy') %></span>
     </a>
   </li>

data/web/views/busy.erb

@@ -15,7 +15,7 @@
       <p><%= t('Threads') %></p>
     </div>
     <div class="stat">
-      <h3><%= ws = workers.size; number_with_delimiter(ws) %></h3>
+      <h3><%= ws = workset.size; number_with_delimiter(ws) %></h3>
       <p><%= t('Busy') %></p>
     </div>
     <div class="stat">
@@ -48,7 +48,7 @@
     <thead>
       <th><%= t('Name') %></th>
       <th><%= t('Started') %></th>
-      <th class="col-sm-1"><%= t('RSS') %><a href="https://github.com/mperham/sidekiq/wiki/Memory#rss"><span class="info-circle" title="Click to learn more about RSS">?</span></a></th>
+      <th class="col-sm-1"><%= t('RSS') %><a target="blank" href="https://github.com/mperham/sidekiq/wiki/Memory#rss"><span class="info-circle" title="Click to learn more about RSS">?</span></a></th>
       <th class="col-sm-1"><%= t('Threads') %></th>
       <th class="col-sm-1"><%= t('Busy') %></th>
       <th>&nbsp;</th>
@@ -109,7 +109,7 @@
       <th><%= t('Arguments') %></th>
       <th><%= t('Started') %></th>
     </thead>
-    <% workers.each do |process, thread, msg| %>
+    <% workset.each do |process, thread, msg| %>
       <% job = Sidekiq::JobRecord.new(msg['payload']) %>
       <tr>
         <td><%= process %></td>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.5.1
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -72,11 +72,12 @@ files:
 - lib/generators/sidekiq/templates/job_spec.rb.erb
 - lib/generators/sidekiq/templates/job_test.rb.erb
 - lib/sidekiq.rb
+- lib/sidekiq/.DS_Store
 - lib/sidekiq/api.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
+- lib/sidekiq/component.rb
 - lib/sidekiq/delay.rb
-- lib/sidekiq/exception_handler.rb
 - lib/sidekiq/extensions/action_mailer.rb
 - lib/sidekiq/extensions/active_record.rb
 - lib/sidekiq/extensions/class_methods.rb
@@ -92,17 +93,20 @@ files:
 - lib/sidekiq/middleware/chain.rb
 - lib/sidekiq/middleware/current_attributes.rb
 - lib/sidekiq/middleware/i18n.rb
+- lib/sidekiq/middleware/modules.rb
 - lib/sidekiq/monitor.rb
 - lib/sidekiq/paginator.rb
 - lib/sidekiq/processor.rb
 - lib/sidekiq/rails.rb
+- lib/sidekiq/redis_client_adapter.rb
 - lib/sidekiq/redis_connection.rb
+- lib/sidekiq/ring_buffer.rb
 - lib/sidekiq/scheduled.rb
 - lib/sidekiq/sd_notify.rb
 - lib/sidekiq/systemd.rb
 - lib/sidekiq/testing.rb
 - lib/sidekiq/testing/inline.rb
-- lib/sidekiq/util.rb
+- lib/sidekiq/transaction_aware_client.rb
 - lib/sidekiq/version.rb
 - lib/sidekiq/web.rb
 - lib/sidekiq/web/action.rb
@@ -193,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Simple, efficient background processing for Ruby

data/lib/sidekiq/exception_handler.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require "sidekiq"
-
-module Sidekiq
-  module ExceptionHandler
-    class Logger
-      def call(ex, ctx)
-        Sidekiq.logger.warn(Sidekiq.dump_json(ctx)) unless ctx.empty?
-        Sidekiq.logger.warn("#{ex.class.name}: #{ex.message}")
-        Sidekiq.logger.warn(ex.backtrace.join("\n")) unless ex.backtrace.nil?
-      end
-
-      Sidekiq.error_handlers << Sidekiq::ExceptionHandler::Logger.new
-    end
-
-    def handle_exception(ex, ctx = {})
-      Sidekiq.error_handlers.each do |handler|
-        handler.call(ex, ctx)
-      rescue => ex
-        Sidekiq.logger.error "!!! ERROR HANDLER THREW AN ERROR !!!"
-        Sidekiq.logger.error ex
-        Sidekiq.logger.error ex.backtrace.join("\n") unless ex.backtrace.nil?
-      end
-    end
-  end
-end

data/lib/sidekiq/util.rb

@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-require "forwardable"
-require "socket"
-require "securerandom"
-require "sidekiq/exception_handler"
-
-module Sidekiq
-  ##
-  # This module is part of Sidekiq core and not intended for extensions.
-  #
-
-  class RingBuffer
-    include Enumerable
-    extend Forwardable
-    def_delegators :@buf, :[], :each, :size
-
-    def initialize(size, default = 0)
-      @size = size
-      @buf = Array.new(size, default)
-      @index = 0
-    end
-
-    def <<(element)
-      @buf[@index % @size] = element
-      @index += 1
-      element
-    end
-
-    def buffer
-      @buf
-    end
-
-    def reset(default = 0)
-      @buf.fill(default)
-    end
-  end
-
-  module Util
-    include ExceptionHandler
-
-    # hack for quicker development / testing environment #2774
-    PAUSE_TIME = $stdout.tty? ? 0.1 : 0.5
-
-    # Wait for the orblock to be true or the deadline passed.
-    def wait_for(deadline, &condblock)
-      remaining = deadline - ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-      while remaining > PAUSE_TIME
-        return if condblock.call
-        sleep PAUSE_TIME
-        remaining = deadline - ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-      end
-    end
-
-    def watchdog(last_words)
-      yield
-    rescue Exception => ex
-      handle_exception(ex, {context: last_words})
-      raise ex
-    end
-
-    def safe_thread(name, &block)
-      Thread.new do
-        Thread.current.name = name
-        watchdog(name, &block)
-      end
-    end
-
-    def logger
-      Sidekiq.logger
-    end
-
-    def redis(&block)
-      Sidekiq.redis(&block)
-    end
-
-    def tid
-      Thread.current["sidekiq_tid"] ||= (Thread.current.object_id ^ ::Process.pid).to_s(36)
-    end
-
-    def hostname
-      ENV["DYNO"] || Socket.gethostname
-    end
-
-    def process_nonce
-      @@process_nonce ||= SecureRandom.hex(6)
-    end
-
-    def identity
-      @@identity ||= "#{hostname}:#{::Process.pid}:#{process_nonce}"
-    end
-
-    def fire_event(event, options = {})
-      reverse = options[:reverse]
-      reraise = options[:reraise]
-
-      arr = Sidekiq.options[:lifecycle_events][event]
-      arr.reverse! if reverse
-      arr.each do |block|
-        block.call
-      rescue => ex
-        handle_exception(ex, {context: "Exception during Sidekiq lifecycle event.", event: event})
-        raise ex if reraise
-      end
-      arr.clear
-    end
-  end
-end