sidekiq 7.0.8 → 7.1.4

data/lib/sidekiq/middleware/current_attributes.rb

@@ -7,26 +7,32 @@ module Sidekiq
   # This can be useful for multi-tenancy, i18n locale, timezone, any implicit
   # per-request attribute. See +ActiveSupport::CurrentAttributes+.
   #
+  # For multiple current attributes, pass an array of current attributes.
+  #
   # @example
   #
   #   # in your initializer
   #   require "sidekiq/middleware/current_attributes"
   #   Sidekiq::CurrentAttributes.persist("Myapp::Current")
+  #   # or multiple current attributes
+  #   Sidekiq::CurrentAttributes.persist(["Myapp::Current", "Myapp::OtherCurrent"])
   #
   module CurrentAttributes
     class Save
       include Sidekiq::ClientMiddleware
 
-      def initialize(cattr)
-        @strklass = cattr
+      def initialize(cattrs)
+        @cattrs = cattrs
       end
 
       def call(_, job, _, _)
-        if !job.has_key?("cattr")
-          attrs = @strklass.constantize.attributes
-          # Retries can push the job N times, we don't
-          # want retries to reset cattr. #5692, #5090
-          job["cattr"] = attrs if attrs.any?
+        @cattrs.each do |(key, strklass)|
+          if !job.has_key?(key)
+            attrs = strklass.constantize.attributes
+            # Retries can push the job N times, we don't
+            # want retries to reset cattr. #5692, #5090
+            job[key] = attrs if attrs.any?
+          end
         end
         yield
       end
@@ -35,22 +41,55 @@ module Sidekiq
     class Load
       include Sidekiq::ServerMiddleware
 
-      def initialize(cattr)
-        @strklass = cattr
+      def initialize(cattrs)
+        @cattrs = cattrs
       end
 
       def call(_, job, _, &block)
-        if job.has_key?("cattr")
-          @strklass.constantize.set(job["cattr"], &block)
-        else
-          yield
+        cattrs_to_reset = []
+
+        @cattrs.each do |(key, strklass)|
+          if job.has_key?(key)
+            constklass = strklass.constantize
+            cattrs_to_reset << constklass
+
+            job[key].each do |(attribute, value)|
+              constklass.public_send("#{attribute}=", value)
+            end
+          end
         end
+
+        yield
+      ensure
+        cattrs_to_reset.each(&:reset)
       end
     end
 
-    def self.persist(klass, config = Sidekiq.default_configuration)
-      config.client_middleware.add Save, klass.to_s
-      config.server_middleware.add Load, klass.to_s
+    class << self
+      def persist(klass_or_array, config = Sidekiq.default_configuration)
+        cattrs = build_cattrs_hash(klass_or_array)
+
+        config.client_middleware.add Save, cattrs
+        config.server_middleware.add Load, cattrs
+      end
+
+      private
+
+      def build_cattrs_hash(klass_or_array)
+        if klass_or_array.is_a?(Array)
+          {}.tap do |hash|
+            klass_or_array.each_with_index do |klass, index|
+              hash[key_at(index)] = klass.to_s
+            end
+          end
+        else
+          {key_at(0) => klass_or_array.to_s}
+        end
+      end
+
+      def key_at(index)
+        (index == 0) ? "cattr" : "cattr_#{index}"
+      end
     end
   end
 end

data/lib/sidekiq/paginator.rb

@@ -19,7 +19,7 @@ module Sidekiq
           total_size, items = conn.multi { |transaction|
             transaction.zcard(key)
             if rev
-              transaction.zrevrange(key, starting, ending, withscores: true)
+              transaction.zrange(key, starting, ending, "REV", withscores: true)
             else
               transaction.zrange(key, starting, ending, withscores: true)
             end

data/lib/sidekiq/processor.rb

@@ -148,6 +148,8 @@ module Sidekiq
 
     IGNORE_SHUTDOWN_INTERRUPTS = {Sidekiq::Shutdown => :never}
     private_constant :IGNORE_SHUTDOWN_INTERRUPTS
+    ALLOW_SHUTDOWN_INTERRUPTS = {Sidekiq::Shutdown => :immediate}
+    private_constant :ALLOW_SHUTDOWN_INTERRUPTS
 
     def process(uow)
       jobstr = uow.job
@@ -171,36 +173,35 @@ module Sidekiq
       end
 
       ack = false
-      begin
-        dispatch(job_hash, queue, jobstr) do |inst|
-          config.server_middleware.invoke(inst, job_hash, queue) do
-            execute_job(inst, job_hash["args"])
+      Thread.handle_interrupt(IGNORE_SHUTDOWN_INTERRUPTS) do
+        Thread.handle_interrupt(ALLOW_SHUTDOWN_INTERRUPTS) do
+          dispatch(job_hash, queue, jobstr) do |inst|
+            config.server_middleware.invoke(inst, job_hash, queue) do
+              execute_job(inst, job_hash["args"])
+            end
           end
+          ack = true
+        rescue Sidekiq::Shutdown
+          # Had to force kill this job because it didn't finish
+          # within the timeout.  Don't acknowledge the work since
+          # we didn't properly finish it.
+        rescue Sidekiq::JobRetry::Handled => h
+          # this is the common case: job raised error and Sidekiq::JobRetry::Handled
+          # signals that we created a retry successfully.  We can acknowlege the job.
+          ack = true
+          e = h.cause || h
+          handle_exception(e, {context: "Job raised exception", job: job_hash})
+          raise e
+        rescue Exception => ex
+          # Unexpected error!  This is very bad and indicates an exception that got past
+          # the retry subsystem (e.g. network partition).  We won't acknowledge the job
+          # so it can be rescued when using Sidekiq Pro.
+          handle_exception(ex, {context: "Internal exception!", job: job_hash, jobstr: jobstr})
+          raise ex
         end
-        ack = true
-      rescue Sidekiq::Shutdown
-        # Had to force kill this job because it didn't finish
-        # within the timeout.  Don't acknowledge the work since
-        # we didn't properly finish it.
-      rescue Sidekiq::JobRetry::Handled => h
-        # this is the common case: job raised error and Sidekiq::JobRetry::Handled
-        # signals that we created a retry successfully.  We can acknowlege the job.
-        ack = true
-        e = h.cause || h
-        handle_exception(e, {context: "Job raised exception", job: job_hash})
-        raise e
-      rescue Exception => ex
-        # Unexpected error!  This is very bad and indicates an exception that got past
-        # the retry subsystem (e.g. network partition).  We won't acknowledge the job
-        # so it can be rescued when using Sidekiq Pro.
-        handle_exception(ex, {context: "Internal exception!", job: job_hash, jobstr: jobstr})
-        raise ex
       ensure
         if ack
-          # We don't want a shutdown signal to interrupt job acknowledgment.
-          Thread.handle_interrupt(IGNORE_SHUTDOWN_INTERRUPTS) do
-            uow.acknowledge
-          end
+          uow.acknowledge
         end
       end
     end

data/lib/sidekiq/rails.rb

@@ -20,6 +20,10 @@ module Sidekiq
       def inspect
         "#<Sidekiq::Rails::Reloader @app=#{@app.class.name}>"
       end
+
+      def to_json(*)
+        Sidekiq.dump_json(inspect)
+      end
     end
 
     # By including the Options module, we allow AJs to directly control sidekiq features
@@ -50,6 +54,12 @@ module Sidekiq
       end
     end
 
+    initializer "sidekiq.backtrace_cleaner" do
+      Sidekiq.configure_server do |config|
+        config[:backtrace_cleaner] = ->(backtrace) { ::Rails.backtrace_cleaner.clean(backtrace) }
+      end
+    end
+
     # This hook happens after all initializers are run, just before returning
     # from config/environment.rb back to sidekiq/cli.rb.
     #

data/lib/sidekiq/redis_client_adapter.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "set"
 require "redis_client"
 require "redis_client/decorator"
 
@@ -8,13 +9,14 @@ module Sidekiq
     BaseError = RedisClient::Error
     CommandError = RedisClient::CommandError
 
+    # You can add/remove items or clear the whole thing if you don't want deprecation warnings.
+    DEPRECATED_COMMANDS = %i[rpoplpush zrangebyscore zrevrange zrevrangebyscore getset hmset setex setnx].to_set
+
     module CompatMethods
-      # TODO Deprecate and remove this
       def info
         @client.call("INFO") { |i| i.lines(chomp: true).map { |l| l.split(":", 2) }.select { |l| l.size == 2 }.to_h }
       end
 
-      # TODO Deprecate and remove this
       def evalsha(sha, keys, argv)
         @client.call("EVALSHA", sha, keys.size, *keys, *argv)
       end
@@ -24,6 +26,7 @@ module Sidekiq
       # this allows us to use methods like `conn.hmset(...)` instead of having to use
       # redis-client's native `conn.call("hmset", ...)`
       def method_missing(*args, &block)
+        warn("[sidekiq#5788] Redis has deprecated the `#{args.first}`command, called at #{caller(1..1)}") if DEPRECATED_COMMANDS.include?(args.first)
         @client.call(*args, *block)
       end
       ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
@@ -39,28 +42,6 @@ module Sidekiq
       def config
         @client.config
       end
-
-      def message
-        yield nil, @queue.pop
-      end
-
-      # NB: this method does not return
-      def subscribe(chan)
-        @queue = ::Queue.new
-
-        pubsub = @client.pubsub
-        pubsub.call("subscribe", chan)
-
-        loop do
-          evt = pubsub.next_event
-          next if evt.nil?
-          next unless evt[0] == "message" && evt[1] == chan
-
-          (_, _, msg) = evt
-          @queue << msg
-          yield self
-        end
-      end
     end
 
     def initialize(options)

data/lib/sidekiq/scheduled.rb

@@ -12,7 +12,7 @@ module Sidekiq
 
       LUA_ZPOPBYSCORE = <<~LUA
         local key, now = KEYS[1], ARGV[1]
-        local jobs = redis.call("zrangebyscore", key, "-inf", now, "limit", 0, 1)
+        local jobs = redis.call("zrange", key, "-inf", now, "byscore", "limit", 0, 1)
         if jobs[1] then
           redis.call("zrem", key, jobs[1])
           return jobs[1]

data/lib/sidekiq/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "7.0.8"
+  VERSION = "7.1.4"
   MAJOR = 7
 end

data/lib/sidekiq/web/action.rb

@@ -15,11 +15,11 @@ module Sidekiq
     end
 
     def halt(res)
-      throw :halt, [res, {"content-type" => "text/plain"}, [res.to_s]]
+      throw :halt, [res, {Rack::CONTENT_TYPE => "text/plain"}, [res.to_s]]
     end
 
     def redirect(location)
-      throw :halt, [302, {"location" => "#{request.base_url}#{location}"}, []]
+      throw :halt, [302, {Web::LOCATION => "#{request.base_url}#{location}"}, []]
     end
 
     def params
@@ -68,7 +68,7 @@ module Sidekiq
     end
 
     def json(payload)
-      [200, {"content-type" => "application/json", "cache-control" => "private, no-store"}, [Sidekiq.dump_json(payload)]]
+      [200, {Rack::CONTENT_TYPE => "application/json", Rack::CACHE_CONTROL => "private, no-store"}, [Sidekiq.dump_json(payload)]]
     end
 
     def initialize(env, block)

data/lib/sidekiq/web/application.rb

@@ -330,7 +330,7 @@ module Sidekiq
 
     def call(env)
       action = self.class.match(env)
-      return [404, {"content-type" => "text/plain", "x-cascade" => "pass"}, ["Not Found"]] unless action
+      return [404, {Rack::CONTENT_TYPE => "text/plain", Web::X_CASCADE => "pass"}, ["Not Found"]] unless action
 
       app = @klass
       resp = catch(:halt) do
@@ -347,10 +347,10 @@ module Sidekiq
       else
         # rendered content goes here
         headers = {
-          "content-type" => "text/html",
-          "cache-control" => "private, no-store",
-          "content-language" => action.locale,
-          "content-security-policy" => CSP_HEADER
+          Rack::CONTENT_TYPE => "text/html",
+          Rack::CACHE_CONTROL => "private, no-store",
+          Web::CONTENT_LANGUAGE => action.locale,
+          Web::CONTENT_SECURITY_POLICY => CSP_HEADER
         }
         # we'll let Rack calculate Content-Length for us.
         [200, headers, [resp]]

data/lib/sidekiq/web/csrf_protection.rb

@@ -62,7 +62,7 @@ module Sidekiq
 
       def deny(env)
         logger(env).warn "attack prevented by #{self.class}"
-        [403, {"Content-Type" => "text/plain"}, ["Forbidden"]]
+        [403, {Rack::CONTENT_TYPE => "text/plain"}, ["Forbidden"]]
       end
 
       def session(env)

data/lib/sidekiq/web.rb

@@ -34,6 +34,18 @@ module Sidekiq
       "Metrics" => "metrics"
     }
 
+    if Gem::Version.new(Rack::RELEASE) < Gem::Version.new("3")
+      CONTENT_LANGUAGE = "Content-Language"
+      CONTENT_SECURITY_POLICY = "Content-Security-Policy"
+      LOCATION = "Location"
+      X_CASCADE = "X-Cascade"
+    else
+      CONTENT_LANGUAGE = "content-language"
+      CONTENT_SECURITY_POLICY = "content-security-policy"
+      LOCATION = "location"
+      X_CASCADE = "x-cascade"
+    end
+
     class << self
       def settings
         self
@@ -137,7 +149,7 @@ module Sidekiq
       m = middlewares
 
       rules = []
-      rules = [[:all, {"cache-control" => "public, max-age=86400"}]] unless ENV["SIDEKIQ_WEB_TESTING"]
+      rules = [[:all, {Rack::CACHE_CONTROL => "private, max-age=86400"}]] unless ENV["SIDEKIQ_WEB_TESTING"]
 
       ::Rack::Builder.new do
         use Rack::Static, urls: ["/stylesheets", "/images", "/javascripts"],

data/sidekiq.gemspec

@@ -23,17 +23,8 @@ Gem::Specification.new do |gem|
     "rubygems_mfa_required" => "true"
   }
 
-  gem.add_dependency "redis-client", ">= 0.11.0"
+  gem.add_dependency "redis-client", ">= 0.14.0"
   gem.add_dependency "connection_pool", ">= 2.3.0"
   gem.add_dependency "rack", ">= 2.2.4"
   gem.add_dependency "concurrent-ruby", "< 2"
-  gem.post_install_message = <<~EOM
-    
-    Welcome to Sidekiq 7.0!
-    
-    1. Use `gem 'sidekiq', '<7'` in your Gemfile if you don't want this new version.
-    2. Read the release notes at https://github.com/sidekiq/sidekiq/blob/main/docs/7.0-Upgrade.md
-    3. If you have problems, search for open/closed issues at https://github.com/sidekiq/sidekiq/issues/
-
-  EOM
 end

data/web/assets/javascripts/application.js

@@ -140,6 +140,7 @@ function checkResponse(resp) {
 
 function scheduleLivePoll() {
   let ti = parseInt(localStorage.sidekiqTimeInterval) || 5000;
+  if (ti < 2000) { ti = 2000 }
   livePollTimer = setTimeout(livePollCallback, ti);
 }
 

data/web/assets/javascripts/dashboard-charts.js

@@ -57,7 +57,9 @@ class DashboardChart extends BaseChart {
 class RealtimeChart extends DashboardChart {
   constructor(el, options) {
     super(el, options);
-    this.delay = parseInt(localStorage.sidekiqTimeInterval) || 5000;
+    let d = parseInt(localStorage.sidekiqTimeInterval) || 5000;
+    if (d < 2000) { d = 2000; }
+    this.delay = d
     this.startPolling();
     document.addEventListener("interval:update", this.handleUpdate.bind(this));
   }

data/web/locales/fr.yml

@@ -17,14 +17,17 @@ fr:
   DeadJobs: Tâches mortes
   Delete: Supprimer
   DeleteAll: Tout supprimer
+  Deploy: Déploiement
   Enqueued: En attente
   Error: Erreur
   ErrorBacktrace: Backtrace d’erreur
   ErrorClass: Classe d’erreur
   ErrorMessage: Message d’erreur
+  ExecutionTime: Temps d'exécution
   Extras: Extras
   Failed: Échouées
   Failures: Echecs
+  Failure: Echec
   GoBack: ← Retour
   History: Historique
   Job: Tâche
@@ -35,6 +38,7 @@ fr:
   Latency: Latence
   LivePoll: Temps réel
   MemoryUsage: Mémoire utilisée
+  Name: Nom
   Namespace: Namespace
   NextRetry: Prochain essai
   NoDeadJobsFound: Aucune tâche morte n'a été trouvée
@@ -63,6 +67,7 @@ fr:
   RetryNow: Réessayer maintenant
   Scheduled: Planifiées
   ScheduledJobs: Tâches planifiées
+  Seconds: Secondes
   ShowAll: Tout montrer
   SixMonths: 6 mois
   Size: Taille
@@ -71,6 +76,8 @@ fr:
   Stop: Arrêter
   StopAll: Tout arrêter
   StopPolling: Arrêt du temps réel
+  Success: Succès
+  Summary: Résumé
   Thread: Thread
   Threads: Threads
   ThreeMonths: 3 mois
@@ -83,3 +90,10 @@ fr:
   Worker: Travailleur
   active: actif
   idle: inactif
+  Metrics: Métriques
+  NoDataFound: Aucune donnée disponible
+  TotalExecutionTime: Temps d'exécution total
+  AvgExecutionTime: Temps d'exécution moyen
+  Context: Contexte
+  Bucket: Bucket
+  NoJobMetricsFound: Aucune statistique de tâche récente n'a été trouvée

data/web/locales/gd.yml

@@ -0,0 +1,99 @@
+# elements like %{queue} are variables and should not be translated
+gd:
+  Actions: Gnìomhan
+  AddToQueue: Cuir ris a’ chiutha
+  AreYouSure: A bheil thu cinnteach?
+  AreYouSureDeleteJob: A bheil thu cinnteach gu bheil thu airson an obair seo a sguabadh às?
+  AreYouSureDeleteQueue: A bheil thu cinnteach gu bheil thu airson ciutha %{queue} a sguabadh às? Sguabaidh seo às gach obair sa chiutha seo, nochdaidh e a-rithist nuair a phutas tu barrachd obraichean dha an uairsin.
+  Arguments: Argamaidean
+  BackToApp: Till dhan aplacaid
+  Busy: Trang
+  Class: Clas
+  Connections: Ceanglaichean
+  CreatedAt: Air a chruthachadh
+  CurrentMessagesInQueue: Obraichean làithreach am broinn <span class='title'>%{queue}</span>
+  Dashboard: Deas-bhòrd
+  Dead: Marbh
+  DeadJobs: Obraichean marbh
+  Delete: Sguab às
+  DeleteAll: Sguab às na h-uile
+  Deploy: Cuir an gnìomh
+  Enqueued: Sa chiutha
+  Error: Mearachd
+  ErrorBacktrace: Backtrace na mearachd
+  ErrorClass: Clas na mearachd
+  ErrorMessage: Teachdaireachd na mearachd
+  ExecutionTime: Àm a’ ghnìomha
+  Extras: Nithean a bharrachd
+  Failed: Air fàilligeadh
+  Failures: Fàilligidhean
+  Failure: Fàilligeadh
+  GoBack: ← Air ais
+  History: Eachdraidh
+  Job: Obair
+  Jobs: Obraichean
+  Kill: Marbh
+  KillAll: Marbh na h-uile
+  LastRetry: An oidhirp mu dheireadh
+  Latency: Foillidheachd
+  LivePoll: Ath-nuadhachadh beò
+  MemoryUsage: Cleachdadh a’ chuimhne
+  Name: Ainm
+  Namespace: Ainm-spàs
+  NextRetry: An ath-oidhirp
+  NoDeadJobsFound: Cha deach obair mharbh a lorg
+  NoRetriesFound: Cha deach ath-oidhirp a lorg
+  NoScheduledFound: Cha deach obair air an sgeideal a lorg
+  NotYetEnqueued: Chan eil seo sa chiutha fhathast
+  OneMonth: Mìos
+  OneWeek: Seachdain
+  OriginallyFailed: Dh’fhàillig e o thùs
+  Pause: Cuir ’na stad
+  Paused: ’Na stad
+  PeakMemoryUsage: Bàrr cleachdadh a’ chuimhne
+  Plugins: Plugain
+  PollingInterval: Eadaramh an ath-nuadhachaidh
+  Process: Pròiseas
+  Processed: Air pròiseasadh
+  Processes: Pròiseasan
+  Queue: Ciutha
+  Queues: Ciuthan
+  Quiet: Mùch
+  QuietAll: Mùch na h-uile
+  Realtime: Fìor-àm
+  Retries: Oidhirpean
+  RetryAll: Feuch ris na h-uile a-rithist
+  RetryCount: Cunntas nan oidhirpean
+  RetryNow: Feuch ris a-rithist an-dràsta
+  Scheduled: Air an sgeideal
+  ScheduledJobs: Obraichean air an sgeideal
+  Seconds: Diogan
+  ShowAll: Seall na h-uile
+  SixMonths: Leth-bhliadhna
+  Size: Meud
+  Started: Air a thòiseachadh
+  Status: Staid
+  Stop: Cuir stad air
+  StopAll: Cuir stad air na h-uile
+  StopPolling: Sguir dhen ath-nuadhachadh
+  Success: Chaidh leis
+  Summary: Geàrr-chunntas
+  Thread: Snàithlean
+  Threads: Snàithleanan
+  ThreeMonths: 3 mìosan
+  Time: Àm
+  Unpause: Lean air
+  Uptime: Beò fad (làithean)
+  Utilization: Cleachdadh
+  Version: Tionndadh
+  When: Cuin
+  Worker: Obraiche
+  active: gnìomhach
+  idle: ’na thàmh
+  Metrics: Meatraigeachd
+  NoDataFound: Cha deach dàta a lorg
+  TotalExecutionTime: Ùine iomlan nan gnìomhan
+  AvgExecutionTime: Ùine cuibheasach nan gnìomhan
+  Context: Co-theacsa
+  Bucket: Bucaid
+  NoJobMetricsFound: Cha deach meatraigeachd o chionn goirid air obair a lorg

data/web/locales/pt-br.yml

@@ -5,10 +5,13 @@
   AreYouSureDeleteJob: Deseja deletar esta tarefa?
   AreYouSureDeleteQueue: Deseja deletar a fila %{queue}? Isso irá deletar todas as tarefas desta fila.
   Arguments: Argumentos
+  AvgExecutionTime: Tempo médio de execução
   BackToApp: De volta ao aplicativo
+  Bucket: Bucket
   Busy: Ocupados
   Class: Classe
   Connections: Conexões
+  Context: Contexto
   CreatedAt: Criado em
   CurrentMessagesInQueue: Mensagens atualmente na <span class='title'>%{queue}</span>
   Dashboard: Painel
@@ -16,13 +19,16 @@
   DeadJobs: Tarefas mortas
   Delete: Apagar
   DeleteAll: Apagar tudo
+  Deploy: Deploy
   Enqueued: Na fila
   Error: Erro
   ErrorBacktrace: Rastreamento do erro
   ErrorClass: Classe de erro
   ErrorMessage: Mensagem de erro
+  ExecutionTime: Tempo de execução
   Extras: Extras
   Failed: Falhas
+  Failure: Falha
   Failures: Falhas
   GoBack: ← Voltar
   History: Histórico
@@ -34,10 +40,13 @@
   Latency: Latência
   LivePoll: Live Poll
   MemoryUsage: Uso de memória
+  Metrics: Métricas
   Name: Nome
   Namespace: Namespace
   NextRetry: Próxima Tentativa
+  NoDataFound: Nenhum dado encontrado
   NoDeadJobsFound: Nenhuma tarefa morta foi encontrada
+  NoJobMetricsFound: Nenhuma métrica de tarefa encontrada
   NoRetriesFound: Nenhuma tentativa encontrada
   NoScheduledFound: Nenhuma tarefa agendada foi encontrada
   NotYetEnqueued: Ainda não enfileirado
@@ -47,6 +56,7 @@
   Pause: Pausar
   Paused: Pausado
   PeakMemoryUsage: Pico de uso de memória
+  Uptime: Tempo de atividade
   Plugins: Plug-ins
   PollingInterval: Intervalo de Polling
   Process: Processo
@@ -63,14 +73,24 @@
   RetryNow: Tentar novamente agora
   Scheduled: Agendados
   ScheduledJobs: Tarefas agendadas
+  idle: Ocioso
+  active: Ativo
+  Seconds: Segundos
   ShowAll: Mostrar todos
   SixMonths: 6 meses
   Size: Tamanho
+  Started: Iniciado
   Stop: Parar
   StopAll: Parar Todos
   StopPolling: Parar Polling
+  Success: Sucesso
+  Summary: Resumo
   Thread: Thread
   Threads: Threads
+  ThreeMonths: 3 meses
+  TotalExecutionTime: Tempo total de execução
   Unpause: Despausar
   Utilization: Utilização
+  Version: Versão
+  When: Quando
   Worker: Trabalhador

data/web/views/_job_info.erb

@@ -37,7 +37,7 @@
       <tr>
         <th>BID</th>
         <td>
-          <a href="<%= root_path %>batches/<%= job.bid %>"><%= job.bid %>
+          <a href="<%= root_path %>batches/<%= job.bid %>"><%= job.bid %></a>
         </td>
       </tr>
       <% end %>

data/web/views/busy.erb

@@ -33,8 +33,8 @@
     <form method="POST" class="warning-messages">
       <%= csrf_tag %>
       <div class="btn-group pull-right flip">
-        <button class="btn btn-warn" type="submit" name="quiet" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('QuietAll') %></button>
-        <button class="btn btn-danger" type="submit" name="stop" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('StopAll') %></button>
+        <input class="btn btn-warn" type="submit" name="quiet" value="<%= t('QuietAll') %>" data-confirm="<%= t('AreYouSure') %>"/>
+        <input class="btn btn-danger" type="submit" name="stop" value="<%= t('StopAll') %>" data-confirm="<%= t('AreYouSure') %>"/>
       </div>
     </form>
   </div>