sidekiq 3.4.1 → 7.3.0

data/web/locales/vi.yml

@@ -0,0 +1,83 @@
+# elements like %{queue} are variables and should not be translated
+vi:
+  Actions: Những hành động
+  AddToQueue: Thêm vào hàng đợi
+  AreYouSure: Bạn chắc chứ?
+  AreYouSureDeleteJob: Bạn có chắc là muốn xóa tác vụ này?
+  AreYouSureDeleteQueue: Bạn có chắc là muốn xóa %{queue} này?
+  Arguments: Tham số
+  BackToApp: Trở về ứng dụng
+  Busy: Bận rộn
+  Class: Lớp
+  Connections: Các kết nối
+  CreatedAt: Được tạo vào lúc
+  CurrentMessagesInQueue: Số lượng công việc trong <span class='title'>%{queue}</span>
+  Dashboard: Bảng điều khiển
+  Dead: Chết
+  DeadJobs: Những tác vụ đã chết
+  Delete: Xóa
+  DeleteAll: Xóa hết
+  Enqueued: Đã xếp hàng đợi
+  Error: Lỗi
+  ErrorBacktrace: Dấu vết của lỗi
+  ErrorClass: Lớp lỗi
+  ErrorMessage: Tin nhắn lỗi
+  Extras: Thêm
+  Failed: Đã thất bại
+  Failures: Các thất bại
+  GoBack: ← Trở lại
+  History: Lịch sử
+  Job: Tác vụ
+  Jobs: Các tác vụ
+  Kill: Giết
+  KillAll: Giết hết
+  LastRetry: Lần thử cuối
+  Latency: Độ trễ
+  LivePoll: Thăm dò trực tiếp
+  MemoryUsage: Lượng bộ nhớ sử dụng
+  Namespace: Không gian tên
+  NextRetry: Lần thử lại tiếp theo
+  NoDeadJobsFound: Không có tác vụ đã chết nào được tìm thấy
+  NoRetriesFound: Không có lần thử nào được tìm thấy
+  NoScheduledFound: Không có tác vụ đã lên lịch nào được tìm thấy
+  NotYetEnqueued: Chưa được bỏ vào hàng đợi
+  OneMonth: 1 tháng
+  OneWeek: 1 tuần
+  OriginallyFailed: Đã thất bại từ đầu
+  Pause: Tạm dừng
+  Paused: Đã tạm dừng
+  PeakMemoryUsage: Lượng bộ nhớ sử dụng đỉnh điểm
+  Plugins: Hệ thống đính kèm
+  PollingInterval: Khoảng thời gian giữa các lần thăm dò
+  Processed: Đã xử lí
+  Processes: Tiến trình xử lí
+  Queue: Hàng đợi
+  Queues: Các hàng đợi
+  Quiet: Im lặng
+  QuietAll: Làm cho tất cả im lặng
+  Realtime: Thời gian thực
+  Retries: Số lần thử
+  RetryAll: Thử lại tất cả
+  RetryCount: Số lần thử lại
+  RetryNow: Thử lại ngay bây giờ
+  Scheduled: Đã lên lịch
+  ScheduledJobs: Những Tác Vụ Được Hẹn
+  ShowAll: Hiện tất cả
+  SixMonths: 6 tháng
+  Size: Kích thước
+  Started: Đã bắt đầu
+  Status: Trạng thái
+  Stop: Dừng Lại
+  StopAll: Dừng lại tất cả
+  StopPolling: Ngừng thăm dò
+  Thread: Luồng xử lí
+  Threads: Những luồng xử lí
+  ThreeMonths: 3 tháng
+  Time: Thời gian
+  Unpause: Hủy tạm dừng
+  Uptime: Thời gian hệ thống đã online (days)
+  Version: Phiên bản
+  When: Khi nào
+  Worker: Máy xử lí
+  active: Đang hoạt động
+  idle: Đang chờ

data/web/locales/zh-cn.yml

@@ -7,6 +7,7 @@ zh-cn: # <---- change this to your locale code
   Realtime: 实时
   History: 历史记录
   Busy: 执行中
+  Utilization: 利用率
   Processed: 已处理
   Failed: 已失败
   Scheduled: 已计划
@@ -17,36 +18,38 @@ zh-cn: # <---- change this to your locale code
   StopPolling: 停止轮询
   Queue: 队列
   Class: 类别
-  Job: 作业
+  Job: 任务
   Arguments: 参数
   Extras: 额外的
   Started: 已开始
   ShowAll: 显示全部
-  CurrentMessagesInQueue: 目前在<span class='title'>%{queue}</span>的作业
+  CurrentMessagesInQueue: 目前在<span class='title'>%{queue}</span>的任务
   Delete: 删除
   AddToQueue: 添加至队列
-  AreYouSureDeleteJob: 你确定要删除这个作业么？
+  AreYouSureDeleteJob: 你确定要删除这个任务么？
   AreYouSureDeleteQueue: 你确定要删除%{queue}这个队列？
   Queues: 队列
   Size: 容量
   Actions: 动作
   NextRetry: 下次重试
-  RetryCount: 重试次數
+  RetryCount: 重试次数
   RetryNow: 现在重试
-  LastRetry: 最后一次重试
-  OriginallyFailed: 原本已失败
+  Kill: 终止
+  LastRetry: 上次重试
+  OriginallyFailed: 首次失败
   AreYouSure: 你确定？
-  DeleteAll: 删除全部
-  RetryAll: 重试全部
-  NoRetriesFound: 沒有发现可重试
+  DeleteAll: 全部删除
+  RetryAll: 全部重试
+  KillAll: 全部终止
+  NoRetriesFound: 没有发现可重试
   Error: 错误
   ErrorClass: 错误类别
   ErrorMessage: 错误消息
-  ErrorBacktrace: 错误的回调追踪
+  ErrorBacktrace: 错误细节
   GoBack: ← 返回
-  NoScheduledFound: 沒有发现计划作业
+  NoScheduledFound: 没有发现计划任务
   When: 当
-  ScheduledJobs: 计划作业
+  ScheduledJobs: 计划任务
   idle: 闲置
   active: 活动中
   Version: 版本
@@ -59,10 +62,34 @@ zh-cn: # <---- change this to your locale code
   ThreeMonths: 三个月
   SixMonths: 六个月
   Failures: 失败
-  DeadJobs: 已停滞作业
-  NoDeadJobsFound: 沒有发现任何已停滞的作业
+  DeadJobs: 已停滞任务
+  NoDeadJobsFound: 没有发现任何已停滞的任务
   Dead: 已停滞
-  Processes: 处理中
+  Process: 进程
+  Processes: 进程
+  Name: 名称
   Thread: 线程
   Threads: 线程
-  Jobs: 作业
+  Jobs: 任务
+  Paused: 已暂停
+  Stop: 强制暂停
+  Quiet: 暂停
+  StopAll: 全部强制暂停
+  QuietAll: 全部暂停
+  PollingInterval: 轮询周期
+  Plugins: 插件
+  NotYetEnqueued: 尚未进入队列
+  CreatedAt: 建立时间
+  BackToApp: 回首頁
+  Latency: 延迟
+  Pause: 暂停
+  Unpause: 取消暂停
+  Metrics: 指标
+  NoDataFound: 无数据
+  TotalExecutionTime: 总执行时间
+  AvgExecutionTime: 平均执行时间
+  Context: 上下文
+  Bucket: 桶
+  NoJobMetricsFound: 无任务相关指标数据
+  Success: 成功
+  Failure: 失败

data/web/locales/zh-tw.yml

@@ -7,6 +7,7 @@ zh-tw: # <---- change this to your locale code
   Realtime: 即時
   History: 歷史資料
   Busy: 忙碌
+  Utilization: 使用率
   Processed: 已處理
   Failed: 已失敗
   Scheduled: 已排程
@@ -25,26 +26,29 @@ zh-tw: # <---- change this to your locale code
   CurrentMessagesInQueue: 目前在<span class='title'>%{queue}</span>的工作
   Delete: 刪除
   AddToQueue: 增加至佇列
-  AreYouSureDeleteJob: 你確定要刪除這個工作嗎？
-  AreYouSureDeleteQueue: 你確定要刪除%{queue}這個佇列？
+  AreYouSureDeleteJob: 確定要刪除這個工作嗎？
+  AreYouSureDeleteQueue: 確定要刪除%{queue}佇列？這會刪除佇列裡的所有工作，佇列將會在有新工作時重新出現。
   Queues: 佇列
   Size: 容量
   Actions: 動作
   NextRetry: 下次重試
   RetryCount: 重試次數
   RetryNow: 馬上重試
+  Kill: 取消
   LastRetry: 最後一次重試
   OriginallyFailed: 原本已失敗
   AreYouSure: 你確定？
-  DeleteAll: 刪除全部
-  RetryAll: 重試全部
-  NoRetriesFound: 沒有發現可重試
+  DeleteAll: 全部刪除
+  RetryAll: 全部重試
+  KillAll: 全部取消
+  NoRetriesFound: 找無可重試的工作
   Error: 錯誤
+  ErrorBacktrace: 錯誤的回調追踨
   ErrorClass: 錯誤類別
   ErrorMessage: 錯誤訊息
-  ErrorBacktrace: 錯誤的回調追踨
+  ErrorBacktrace: 詳細錯誤訊息
   GoBack: ← 返回
-  NoScheduledFound: 沒有發現已排程的工作
+  NoScheduledFound: 找無已排程的工作
   When: 當
   ScheduledJobs: 已排程的工作
   idle: 閒置
@@ -59,10 +63,40 @@ zh-tw: # <---- change this to your locale code
   ThreeMonths: 三個月
   SixMonths: 六個月
   Failures: 失敗
-  DeadJobs: 停滯工作
+  GoBack: ← 返回
+  History: 歷史資料
+  Job: 工作
+  Jobs: 工作
+  LastRetry: 最後一次重試
+  LivePoll: 即時輪詢
+  MemoryUsage: 記憶體使用量
+  Namespace: 命名空間
+  NextRetry: 下次重試
   NoDeadJobsFound: 沒有發現任何停滯的工作
   Dead: 停滯
+  Process: 程序
   Processes: 處理中
+  Name: 名稱
   Thread: 執行緒
   Threads: 執行緒
   Jobs: 工作
+  Paused: 已暫停
+  Stop: 強制暫停
+  Quiet: 暫停
+  StopAll: 全部強制暫停
+  QuietAll: 全部暫停
+  PollingInterval: 輪詢週期
+  Plugins: 套件
+  NotYetEnqueued: 尚未進入佇列
+  CreatedAt: 建立時間
+  BackToApp: 回首頁
+  Latency: 延時
+  Pause: 暫停
+  Unpause: 取消暫停
+  Metrics: 計量
+  NoDataFound: 找無資料
+  TotalExecutionTime: 總執行時間
+  AvgExecutionTime: 平均執行時間
+  Context: 上下文
+  Bucket: 桶
+  NoJobMetricsFound: 找無工作相關計量資料

data/web/views/_footer.erb

@@ -1,21 +1,34 @@
-<div class="navbar navbar-fixed-bottom navbar-inverse">
+<div class="navbar navbar-fixed-bottom navbar-inverse ltr">
   <div class="navbar-inner">
     <div class="container text-center">
         <ul class="nav">
           <li>
-            <p class="navbar-text" style="color:white;"><%= product_version %></p>
+            <p class="navbar-text product-version"><%= product_version %></p>
           </li>
           <li>
-            <p class="navbar-text redis-url">Redis: <%= redis_connection %></p>
+            <p class="navbar-text redis-url" title="<%= redis_url %>"><%= redis_url %></p>
           </li>
           <li>
-            <p class="navbar-text"><%= t('Time') %>: <%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
+            <p id="serverUtcTime" class="navbar-text server-utc-time"><%= server_utc_time %></p>
+          </li>
+          <li>
+            <p class="navbar-text"><a rel=help href="https://github.com/sidekiq/sidekiq/wiki">docs</a></p>
+          </li>
+          <li>
+            <form id="locale-form" class="form-inline" action="<%= root_path %>change_locale" method="post">
+              <%= csrf_tag %>
+              <label class="sr-only" for="locale">Language</label>
+              <select id="locale-select" class="form-control" name="locale">
+                <% available_locales.each do |locale_option| %>
+                  <% if locale_option == locale %>
+                    <option selected value="<%= locale_option %>"><%= locale_option %></option>
+                  <% else %>
+                    <option value="<%= locale_option %>"><%= locale_option %></option>
+                  <% end %>
+                <% end %>
+              </select>
+            </form>
           </li>
-          <% if namespace %>
-              <li>
-                <p class="navbar-text redis-namespace"><%= t('Namespace') %>: <%= namespace %></p>
-              </li>
-          <% end %>
         </ul>
     </div>
   </div>

data/web/views/_job_info.erb

@@ -1,9 +1,9 @@
-<header>
+<div class="header-container">
   <h3><%= t('Job') %></h3>
-</header>
+</div>
 
 <div class="table_container">
-  <table class="table table-bordered table-striped">
+  <table class="table table-bordered table-striped table-hover">
     <tbody>
       <tr>
         <th><%= t('Queue') %></th>
@@ -14,7 +14,8 @@
       <tr>
         <th><%= t('Job') %></th>
         <td>
-          <code><%= job.display_class %></code>
+          <%= job.display_class %>
+          <%= display_tags(job) %>
         </td>
       </tr>
       <tr>
@@ -32,9 +33,21 @@
           <code><%= job.jid %></code>
         </td>
       </tr>
+      <% if job.bid %>
+      <tr>
+        <th>BID</th>
+        <td>
+          <a href="<%= root_path %>batches/<%= job.bid %>"><%= job.bid %></a>
+        </td>
+      </tr>
+      <% end %>
+      <tr>
+        <th><%= t('CreatedAt') %></th>
+        <td><%= relative_time(job.created_at) %></td>
+      </tr>
       <tr>
         <th><%= t('Enqueued') %></th>
-        <td><%= relative_time(job.enqueued_at) %></td>
+        <td><%= (enqueued_at = job.enqueued_at) ? relative_time(enqueued_at) : t('NotYetEnqueued') %></td>
       </tr>
       <% unless retry_extra_items(job).empty? %>
         <tr>
@@ -76,9 +89,17 @@
       <% if type == :dead %>
         <tr>
           <th><%= t('LastRetry') %></th>
-          <td><%= relative_time(job.at) %></td>
+          <td><%= relative_time(job.at) if job['retry_count'] %></td>
         </tr>
       <% end %>
+      <% Sidekiq::Web.custom_job_info_rows.each do |helper| %>
+        <% helper.add_pair(job) do |name, value| %>
+          <tr>
+            <th><%= name %></th>
+            <td><%= value %></td>
+          </tr>
+        <% end %>
+      <% end %>
     </tbody>
   </table>
 </div>

data/web/views/_metrics_period_select.erb

@@ -0,0 +1,12 @@
+<div>
+  <select class="form-control" data-metric-period="<%= path %>">
+    <% periods.each_key do |code| %>
+
+      <% if code == period %>
+        <option selected value="<%= code %>"><%= code %></option>
+      <% else %>
+        <option value="<%= code %>"><%= code %></option>
+      <% end %>
+    <% end %>
+  </select>
+</div>

data/web/views/_nav.erb

@@ -1,15 +1,15 @@
 <div class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header" data-navbar="static">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-menu">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="navbar-menu" data-target="#navbar-menu">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
       <div class="navbar-toggle collapsed navbar-livereload">
-        <%= erb :_poll %>
+        <%= erb :_poll_link %>
         <% if Sidekiq::Web.app_url %>
-          <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
+          <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>"><%= t('BackToApp') %></a>
         <% end %>
       </div>
       <a class="navbar-brand" href="<%= root_path %>">
@@ -32,31 +32,17 @@
           <% end %>
         <% end %>
 
-        <li class="dropdown" data-navbar="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-            <%= t('Plugins') %> <span class="caret"></span>
-          </a>
-          <ul class="dropdown-menu" role="menu">
-            <% Sidekiq::Web.custom_tabs.each do |title, url| %>
-              <li>
-                <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
-              </li>
-            <% end %>
-          </ul>
-        </li>
-
         <% Sidekiq::Web.custom_tabs.each do |title, url| %>
           <li class="<%= current_path.start_with?(url) ? 'active' : '' %>" data-navbar="custom-tab">
             <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
           </li>
         <% end %>
-      </ul>
-      <ul class="nav navbar-nav navbar-right navbar-livereload" data-navbar="static">
-        <li>
-          <div class="poll-wrapper pull-right">
-            <%= erb :_poll %>
+
+        <li class="navbar-livereload">
+          <div class="poll-wrapper">
+            <%= erb :_poll_link %>
             <% if Sidekiq::Web.app_url %>
-              <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
+              <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>"><%= t('BackToApp') %></a>
             <% end %>
           </div>
         </li>

data/web/views/_paging.erb

@@ -1,5 +1,6 @@
+<div>
 <% if @total_size > @count %>
-  <ul class="pagination pull-right">
+  <ul class="pagination pull-right flip">
     <li class="<%= 'disabled' if @current_page == 1 %>">
       <a href="<%= url %>?page=1">&laquo;</a>
     </li>
@@ -21,3 +22,4 @@
     </li>
   </ul>
 <% end %>
+</div>

data/web/views/_poll_link.erb

@@ -0,0 +1,4 @@
+<% 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 %>

data/web/views/_summary.erb

@@ -1,39 +1,39 @@
 <ul class="list-unstyled summary row">
   <li class="processed col-sm-1">
-    <span class="count"><%= number_with_delimiter(stats.processed) %></span>
+    <span id="txtProcessed" class="count" data-nwp><%= stats.processed %></span>
     <span class="desc"><%= t('Processed') %></span>
   </li>
   <li class="failed col-sm-1">
-    <span class="count"><%= number_with_delimiter(stats.failed) %></span>
+    <span id="txtFailed" class="count" data-nwp><%= stats.failed %></span>
     <span class="desc"><%= t('Failed') %></span>
   </li>
   <li class="busy col-sm-1">
     <a href="<%= root_path %>busy">
-      <span class="count"><%= number_with_delimiter(workers.size) %></span>
+      <span id="txtBusy" class="count" data-nwp><%= workset.size %></span>
       <span class="desc"><%= t('Busy') %></span>
     </a>
   </li>
   <li class="enqueued col-sm-1">
     <a href="<%= root_path %>queues">
-      <span class="count"><%= number_with_delimiter(stats.enqueued) %></span>
+      <span id="txtEnqueued" class="count" data-nwp><%= stats.enqueued %></span>
       <span class="desc"><%= t('Enqueued') %></span>
     </a>
   </li>
   <li class="retries col-sm-1">
     <a href="<%= root_path %>retries">
-      <span class="count"><%= number_with_delimiter(stats.retry_size) %></span>
+      <span id="txtRetries" class="count" data-nwp><%= stats.retry_size %></span>
       <span class="desc"><%= t('Retries') %></span>
     </a>
   </li>
   <li class="scheduled col-sm-1">
     <a href="<%= root_path %>scheduled">
-      <span class="count"><%= number_with_delimiter(stats.scheduled_size) %></span>
+      <span id="txtScheduled" class="count" data-nwp><%= stats.scheduled_size %></span>
       <span class="desc"><%= t('Scheduled') %></span>
     </a>
   </li>
   <li class="dead col-sm-1">
     <a href="<%= root_path %>morgue">
-      <span class="count"><%= number_with_delimiter(stats.dead_size) %></span>
+      <span id="txtDead" class="count" data-nwp><%= stats.dead_size %></span>
       <span class="desc"><%= t('Dead') %></span>
     </a>
   </li>