sidekiq 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c6762c97172b3f8e4b7cc1fd940756ee8796faf70ece8d5e9ede9e2dc7797fe
-  data.tar.gz: 905e0e1f381e1c40832ab2137589161fcccfb63c847ad36c9cca15765d952659
+  metadata.gz: 98aab60f0a9bd14122cf62b2f31c17e41b67feb8c9fb13865ef0a16002d38ed7
+  data.tar.gz: 94038f0176ccb7785c6112cd41e915e4a1c7f66298a9670457a68e6b62f2710c
 SHA512:
-  metadata.gz: acfc9bb74585cc65ad1af27e263668ec154ac791baa99de2a1542cfe462a7b13544a758a7bd574d623088c9e683f705437cc4e4495f05e57770037d030214a44
-  data.tar.gz: 31320e6cd2fab0d253f3a32616f51360c4ad6a9ef30acef5f88a6ccc6eaf75e04b76ea12dd053dd29442d96fa49234f65e14801e7600cf0f300c023d75aecf43
+  metadata.gz: c41c724dc99aa3fdf49db46eeac0bec822bd6a67989792f4830900da7b74882c27837535a03a2ea6ed0575736fc895b23bb3440613d1f581e877bcbfe1c06934
+  data.tar.gz: 482af09f25f72f9fa0261f02e4e224dc58a400519f167f8cb0ea0dda4960b24a41b105731a4fcc2b81ff15f158497b9bf1cc86d55272ed8fe4ca7ed9029bc047

data/Changes.md

@@ -2,7 +2,13 @@
 
 [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/main/Ent-Changes.md)
 
-main
+7.0.1
+----------
+
+- Allow an embedding process to reuse its own heartbeat thread
+- Update zh-cn localization
+
+7.0.0
 ----------
 
 - Embedded mode!
@@ -10,13 +16,13 @@ main
 - Job Execution metrics!!!
 - See `docs/7.0-Upgrade.md` for release notes
 
-6-x
+6.5.8
 ----------
 
+- Fail if using a bad version of scout_apm [#5616]
 - Add pagination to Busy page [#5556]
 - Speed up WorkSet#each [#5559]
-- Adjust CurrentAttributes to work with the String class name so we aren't referencing
-the Class within a Rails initializer [#5536]
+- Adjust CurrentAttributes to work with the String class name so we aren't referencing the Class within a Rails initializer [#5536]
 
 6.5.7
 ----------

data/lib/sidekiq/embedded.rb

@@ -15,9 +15,9 @@ module Sidekiq
       fire_event(:startup, reverse: false, reraise: true)
       @launcher = Sidekiq::Launcher.new(@config, embedded: true)
       @launcher.run
-      sleep 0.1 # pause to give threads time to spin up
+      sleep 0.2 # pause to give threads time to spin up
 
-      logger.info "Embedded mode running with #{Thread.list.size} threads"
+      logger.info "Sidekiq running embedded, total process thread count: #{Thread.list.size}"
       logger.debug { Thread.list.map(&:name) }
     end
 

data/lib/sidekiq/launcher.rb

@@ -32,15 +32,17 @@ module Sidekiq
       @done = false
     end
 
-    def run
+    # Start this Sidekiq instance. If an embedding process already
+    # has a heartbeat thread, caller can use `async_beat: false`
+    # and instead have thread call Launcher#heartbeat every N seconds.
+    def run(async_beat: true)
       Sidekiq.freeze!
-      @thread = safe_thread("heartbeat", &method(:start_heartbeat))
+      @thread = safe_thread("heartbeat", &method(:start_heartbeat)) if async_beat
       @poller.start
       @managers.each(&:start)
     end
 
     # Stops this instance from processing any more jobs,
-    #
     def quiet
       return if @done
 
@@ -71,18 +73,30 @@ module Sidekiq
       @done
     end
 
+    # If embedding Sidekiq, you can have the process heartbeat
+    # call this method to regularly heartbeat rather than creating
+    # a separate thread.
+    def heartbeat
+      ❤
+    end
+
     private unless $TESTING
 
     BEAT_PAUSE = 10
 
     def start_heartbeat
       loop do
-        heartbeat
+        beat
         sleep BEAT_PAUSE
       end
       logger.info("Heartbeat stopping...")
     end
 
+    def beat
+      $0 = PROCTITLES.map { |proc| proc.call(self, to_data) }.compact.join(" ") unless @embedded
+      ❤
+    end
+
     def clear_heartbeat
       flush_stats
 
@@ -99,12 +113,6 @@ module Sidekiq
       # best effort, ignore network errors
     end
 
-    def heartbeat
-      $0 = PROCTITLES.map { |proc| proc.call(self, to_data) }.compact.join(" ") unless @embedded
-
-      ❤
-    end
-
     def flush_stats
       fails = Processor::FAILURE.reset
       procd = Processor::PROCESSED.reset

data/lib/sidekiq/version.rb

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

data/lib/sidekiq/web/helpers.rb

@@ -323,6 +323,10 @@ module Sidekiq
       Time.now.utc.strftime("%H:%M:%S UTC")
     end
 
+    def pollable?
+      !(current_path == "" || current_path.starts_with?("metrics"))
+    end
+
     def retry_or_delete_or_kill(job, params)
       if params["retry"]
         job.retry

data/sidekiq.gemspec

@@ -41,9 +41,7 @@ Gem::Specification.new do |gem|
      ░░░░░░░░░  ░░░░░ ░░░░░░░░░░   ░░░░░░░░░░ ░░░░░   ░░░░ ░░░░░    ░░░░░░ ░░      ░░░      ░░    ░░░░░░
     
     
-    WARNING: This is a beta release, expect breakage!
-    
-    1. Use `gem 'sidekiq', '<7'` in your Gemfile if you don't want to be a beta tester.
+    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/mperham/sidekiq/blob/main/docs/7.0-Upgrade.md
     3. Search for open/closed issues at https://github.com/mperham/sidekiq/issues/
     

data/web/locales/zh-cn.yml

@@ -32,23 +32,22 @@ zh-cn: # <---- change this to your locale code
   Size: 容量
   Actions: 动作
   NextRetry: 下次重试
-  RetryCount: 重试次數
+  RetryCount: 重试次数
   RetryNow: 现在重试
   Kill: 终止
-  LastRetry: 最后一次重试
-  OriginallyFailed: 原本已失败
+  LastRetry: 上次重试
+  OriginallyFailed: 首次失败
   AreYouSure: 你确定？
   DeleteAll: 全部删除
   RetryAll: 全部重试
   KillAll: 全部终止
-  NoRetriesFound: 沒有发现可重试
+  NoRetriesFound: 没有发现可重试
   Error: 错误
-  ErrorBacktrace: 错误的回调追踪
   ErrorClass: 错误类别
   ErrorMessage: 错误消息
   ErrorBacktrace: 错误细节
   GoBack: ← 返回
-  NoScheduledFound: 沒有发现计划任务
+  NoScheduledFound: 没有发现计划任务
   When: 当
   ScheduledJobs: 计划任务
   idle: 闲置
@@ -64,26 +63,26 @@ zh-cn: # <---- change this to your locale code
   SixMonths: 六个月
   Failures: 失败
   DeadJobs: 已停滞任务
-  NoDeadJobsFound: 沒有发现任何已停滞的任务
+  NoDeadJobsFound: 没有发现任何已停滞的任务
   Dead: 已停滞
   Process: 进程
-  Processes: 处理中
+  Processes: 进程
   Name: 名称
   Thread: 线程
   Threads: 线程
   Jobs: 任务
-  Paused: 已暫停
-  Stop: 強制暫停
-  Quiet: 暫停
-  StopAll: 全部強制暫停
-  QuietAll: 全部暫停
-  PollingInterval: 輪詢週期
-  Plugins: 套件
-  NotYetEnqueued: 尚未進入佇列
-  CreatedAt: 建立時間
+  Paused: 已暂停
+  Stop: 强制暂停
+  Quiet: 暂停
+  StopAll: 全部强制暂停
+  QuietAll: 全部暂停
+  PollingInterval: 轮询周期
+  Plugins: 插件
+  NotYetEnqueued: 尚未进入队列
+  CreatedAt: 建立时间
   BackToApp: 回首頁
-  Latency: 延時
-  Pause: 暫停
+  Latency: 延迟
+  Pause: 暂停
   Unpause: 取消暂停
   Metrics: 指标
   NoDataFound: 无数据
@@ -92,3 +91,5 @@ zh-cn: # <---- change this to your locale code
   Context: 上下文
   Bucket: 桶
   NoJobMetricsFound: 无任务相关指标数据
+  Success: 成功
+  Failure: 失败

data/web/views/_poll_link.erb

@@ -1,4 +1,4 @@
-<% if current_path != '' %>
+<% if pollable? %>
     <a class="live-poll-start live-poll btn btn-primary"><%= t('LivePoll') %></a>
     <a class="live-poll-stop live-poll btn btn-primary active"><%= t('StopPolling') %></a>
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -219,9 +219,7 @@ post_install_message: |2
    ░░░░░░░░░  ░░░░░ ░░░░░░░░░░   ░░░░░░░░░░ ░░░░░   ░░░░ ░░░░░    ░░░░░░ ░░      ░░░      ░░    ░░░░░░
 
 
-  WARNING: This is a beta release, expect breakage!
-
-  1. Use `gem 'sidekiq', '<7'` in your Gemfile if you don't want to be a beta tester.
+  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/mperham/sidekiq/blob/main/docs/7.0-Upgrade.md
   3. Search for open/closed issues at https://github.com/mperham/sidekiq/issues/