sidekiq 3.5.4 → 5.2.7

data/web/locales/ru.yml

@@ -73,3 +73,6 @@ ru:
   QuietAll: Отдыхать всем
   PollingInterval: Интервал опроса
   Plugins: Плагины
+  NotYetEnqueued: Пока не в очереди
+  CreatedAt: Создан
+  BackToApp: Назад

data/web/locales/ur.yml

@@ -0,0 +1,80 @@
+# elements like %{queue} are variables and should not be translated
+ur:
+  TextDirection: 'rtl'
+  Dashboard: صفحۂ اول
+  Status: اسٹیٹس
+  Time: ﻭﻗﺖ
+  Namespace: Namespace
+  Realtime: ﺑﺮاﮦ ﺭاﺳﺖ
+  History: ﺗﺎﺭﻳﺦ
+  Busy: مصروف
+  Processed: مکمل شدہ
+  Failed: ﻧﺎکاﻡ ﺷﺪﮦ
+  Scheduled: ﻁےﺷﺪﮦ
+  Retries: ﺩﻭﺑﺎﺭﮦ کﻭﺷﻴﺶ
+  Enqueued: قطار ميں شامل
+  Worker: ورکر
+  LivePoll: ﺑﺮاﮦ ﺭاﺳﺖ
+  StopPolling: ﺑﺮاﮦ ﺭاﺳﺖ روکيے
+  Queue: قطار
+  Class: کلاس
+  Job: جاب
+  Arguments: دلائل
+  Extras: اﺻﺎﻑی
+  Started: شروع
+  ShowAll: سارے دکھاو
+  CurrentMessagesInQueue:  قطار ميں موجود تمام پيغامات <span class='title'>%{queue}</span>
+  AddToQueue: ﻗﻄﺎﺭ ميں شامل کريں
+  AreYouSureDeleteJob: کيا آپ یقین جاب حتم کرنا چاھتے ہيں ؟
+  AreYouSureDeleteQueue: کيا آپ یقین قطار حتم کرنا چاھتے ہيں ؟
+  Delete: ﺣﺬﻑ
+  Queues: قطاريں
+  Size: ﺣﺠﻢ
+  Actions: ﻋﻮاﻣﻞ
+  NextRetry: اگلی کﻭﺷﻴﺶ
+  RetryCount: دوبارہ کوشش کا مکمل شمار
+  RetryNow: ابھی دوبارہ کوشش
+  Kill: ختم کرديں
+  LastRetry: گزشتہ کوشش
+  OriginallyFailed: ابتادائ ناکامی
+  AreYouSure: کيا یقین ؟
+  DeleteAll: ﺗﻤﺎﻡ ﺣﺬﻑ کر ديں
+  RetryAll: ﺗﻤﺎﻡ کی ﺩﻭﺑﺎﺭﮦ کﻭﺷﻴﺶ کﺭيں
+  NoRetriesFound: کویٔ ﺩﻭﺑﺎﺭﮦ کﻭﺷﻴﺶ نھيں ملی
+  Error: مسئلہ
+  ErrorClass: مسئلہ کی کلاس
+  ErrorMessage: مسئلہ کی وجہ
+  ErrorBacktrace: مسئلہ کی کی تحقیقات کريں
+  GoBack: واپس جايں
+  NoScheduledFound: کویٔ ﻁےﺷﺪﮦچيز نہیں ملی
+  When: ﺏک
+  ScheduledJobs: ﻁےﺷﺪﮦجاب
+  idle: بیکار
+  active: فعال
+  Version: ورژن
+  Connections: کنکشنز
+  MemoryUsage: یاداشت کا استعمال
+  PeakMemoryUsage: سب سے زيادہ یاداشت کا استعمال
+  Uptime: اپ ٹائم
+  OneWeek: ایک ہفتہ
+  OneMonth: ایک مہینہ
+  ThreeMonths: تین ماہ
+  SixMonths: چھ ماہ
+  Failures: ناکامیاں
+  DeadJobs: ختم شدہ جاب
+  NoDeadJobsFound: کویٔ ختم شدہ جاب نہيی ملی
+  Dead: ختم شدہ
+  Processes: ﻋﻤﻠﻴﺎﺕ
+  Thread: موضوع
+  Threads: موضوع
+  Jobs: جابز
+  Paused: موقوف
+  Stop: بند کرو
+  Quiet: ﺣﺘﻢ کﺭﻭ
+  StopAll: ﺗﻤﺎﻡ ﺑﻨﺪ کﺭﻭ
+  QuietAll: ﺗﻤﺎﻡ ﺣﺘﻢ کﺭﻭ
+  PollingInterval: ﺑﺮاﮦ ﺭاﺳﺖ کا ﺩﻭﺭاﻧﻴﮧ
+  Plugins: پلگ انز
+  NotYetEnqueued: ﻗﺘﺎﺭميں شامل نھيں
+  CreatedAt: ﺗﺎﺭﻳﺢ آﻏﺎﺯ
+  BackToApp: ﻭاپﺱ صفحۂ اﻭﻝ پر

data/web/views/_footer.erb

@@ -1,21 +1,19 @@
-<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_connection_and_namespace %>"><%= redis_connection_and_namespace %></p>
           </li>
           <li>
-            <p class="navbar-text"><%= t('Time') %>: <%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
+            <p class="navbar-text server-utc-time"><%= server_utc_time %></p>
+          </li>
+          <li>
+            <p class="navbar-text"><a style="color: gray;" href="https://github.com/mperham/sidekiq/wiki">docs</a></p>
           </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

@@ -32,6 +32,10 @@
           <code><%= job.jid %></code>
         </td>
       </tr>
+      <tr>
+        <th><%= t('CreatedAt') %></th>
+        <td><%= relative_time(job.created_at) %></td>
+      </tr>
       <tr>
         <th><%= t('Enqueued') %></th>
         <td><%= (enqueued_at = job.enqueued_at) ? relative_time(enqueued_at) : t('NotYetEnqueued') %></td>
@@ -76,7 +80,7 @@
       <% 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 %>
     </tbody>

data/web/views/_nav.erb

@@ -9,7 +9,7 @@
       <div class="navbar-toggle collapsed navbar-livereload">
         <%= 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">
+
+        <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,5 @@
 <% 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>

data/web/views/busy.erb

@@ -1,13 +1,13 @@
 <div class="row header">
-  <div class="col-sm-8 pull-left">
+  <div class="col-sm-8 pull-left flip">
     <h3><%= t('Processes') %></h3>
   </div>
-  <div class="col-sm-4 pull-right">
-    <form method="POST" style="margin-top: 20px; margin-bottom: 10px;">
+  <div class="col-sm-4 pull-right flip">
+    <form method="POST" class="warning-messages">
       <%= csrf_tag %>
-      <div class="btn-group pull-right">
-        <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('QuietAll') %></button>
-        <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('StopAll') %></button>
+      <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>
       </div>
     </form>
   </div>
@@ -22,14 +22,21 @@
       <th><%= t('Busy') %></th>
       <th>&nbsp;</th>
     </thead>
+    <% lead = processes.leader %>
     <% processes.each do |process| %>
       <tr>
-        <td width="50%">
+        <td class="box">
           <%= "#{process['hostname']}:#{process['pid']}" %>
           <span class="label label-success"><%= process.tag %></span>
           <% process.labels.each do |label| %>
             <span class="label label-info"><%= label %></span>
           <% end %>
+          <% if process.stopping? %>
+            <span class="label label-danger">quiet</span>
+          <% end %>
+          <% if process.identity == lead %>
+            <span class="label label-warning">leader</span>
+          <% end %>
           <br>
           <b><%= "#{t('Queues')}: " %></b>
           <%= process['queues'] * ", " %>
@@ -38,11 +45,13 @@
         <td><%= process['concurrency'] %></td>
         <td><%= process['busy'] %></td>
         <td>
-          <div class="btn-group pull-right">
+          <div class="btn-group pull-right flip">
             <form method="POST">
               <%= csrf_tag %>
               <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
-              <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
+              <% unless process.stopping? %>
+                <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
+              <% end %>
               <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
             </form>
           </div>

data/web/views/dashboard.erb

@@ -7,11 +7,11 @@
       <span class="dot"></span>
     </span>
   </h3>
-  <div class="interval-slider">
+  <div class="interval-slider ltr">
     <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
-    <span class="current-interval">2 sec</span>
+    <span class="current-interval">5 sec</span>
     <br/>
-    <input type="range" min="2000" max="20000" step="1000" value="2000"/>
+    <input type="range" min="2000" max="20000" step="1000" value="5000"/>
   </div>
 </div>
 
@@ -58,14 +58,14 @@
       </div>
     <% end %>
 
-    <%  if @redis_info.fetch("used_memory_human", nil) %>
+    <% if @redis_info.fetch("used_memory_human", nil) %>
       <div class="stat">
         <h3 class="used_memory_human"><%= @redis_info.fetch("used_memory_human") %></h3>
         <p><%= t('MemoryUsage') %></p>
       </div>
     <% end %>
 
-    <%  if @redis_info.fetch("used_memory_peak_human", nil) %>
+    <% if @redis_info.fetch("used_memory_peak_human", nil) %>
       <div class="stat">
         <h3 class="used_memory_peak_human"><%= @redis_info.fetch("used_memory_peak_human") %></h3>
         <p><%= t('PeakMemoryUsage') %></p>

data/web/views/dead.erb

@@ -1,4 +1,4 @@
-<%= erb :_job_info, :locals => {:job => @dead, :type => :dead} %>
+<%= erb :_job_info, locals: { job: @dead, type: :dead } %>
 
 <h3><%= t('Error') %></h3>
 <div class="table_container">

data/web/views/layout.erb

@@ -1,17 +1,26 @@
 <!doctype html>
-<html>
+<html dir="<%= text_direction %>">
   <head>
     <title><%= environment_title_prefix %><%= Sidekiq::NAME %></title>
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+
     <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
+    <% if rtl? %>
+    <link href="<%= root_path %>stylesheets/bootstrap-rtl.min.css" media="screen" rel="stylesheet" type="text/css"/>
+    <% end %>
+
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    <% if rtl? %>
+    <link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
+    <% end %>
+
     <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
     <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
-    <script type="text/javascript" src="<%= root_path %>javascripts/locales/jquery.timeago.<%= locale %>.js"></script>
     <meta name="google" content="notranslate" />
     <%= display_custom_head %>
   </head>
-  <body class="admin">
+  <body class="admin" data-poll-path="<%= poll_path %>" data-locale="<%= locale %>">
     <%= erb :_nav %>
     <div id="page">
       <div class="container">
@@ -26,7 +35,6 @@
         </div>
       </div>
     </div>
-    <%=  erb :_footer %>
-    <%= erb :_poll_js %>
+    <%= erb :_footer %>
   </body>
 </html>

data/web/views/morgue.erb

@@ -4,7 +4,7 @@
   </div>
   <% if @dead.size > 0 && @total_size > @count %>
     <div class="col-sm-4">
-      <%= erb :_paging, :locals => { :url => "#{root_path}morgue" } %>
+      <%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
     </div>
   <% end %>
   <%= filtering('dead') %>
@@ -17,7 +17,7 @@
       <table class="table table-striped table-bordered table-white">
         <thead>
           <tr>
-            <th width="20px" class="table-checkbox">
+            <th class="table-checkbox checkbox-column">
               <label>
                 <input type="checkbox" class="check_all" />
               </label>
@@ -47,24 +47,28 @@
               <div class="args"><%= display_args(entry.display_args) %></div>
             </td>
             <td>
+              <% if entry.error? %>
               <div><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></div>
+              <% end %>
             </td>
           </tr>
         <% end %>
       </table>
     </div>
-    <input class="btn btn-primary btn-xs pull-left" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger btn-xs pull-left" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <input class="btn btn-primary btn-xs pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+    <input class="btn btn-danger btn-xs pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
   </form>
 
-  <form action="<%= root_path %>morgue/all/delete" method="post">
-    <%= csrf_tag %>
-    <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </form>
-  <form action="<%= root_path %>morgue/all/retry" method="post">
-    <%= csrf_tag %>
-    <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </form>
+  <% unfiltered? do %>
+    <form action="<%= root_path %>morgue/all/delete" method="post">
+      <%= csrf_tag %>
+      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+    </form>
+    <form action="<%= root_path %>morgue/all/retry" method="post">
+      <%= csrf_tag %>
+      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+    </form>
+  <% end %>
 
 <% else %>
   <div class="alert alert-success"><%= t('NoDeadJobsFound') %></div>

data/web/views/queue.erb

@@ -5,10 +5,11 @@
       <% if @queue.paused? %>
         <span class="label label-danger"><%= t('Paused') %></span>
       <% end %>
+      <span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
     </h3>
   </div>
-  <div class="col-sm-4 pull-right">
-    <%= erb :_paging, :locals => { :url => "#{root_path}queues/#{@name}" } %>
+  <div class="col-sm-4 pull-right flip">
+    <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
   </div>
 </header>
 <div class="table_container">
@@ -22,19 +23,19 @@
       <tr>
         <td><%= h(msg.display_class) %></td>
         <td>
-          <% a = msg.display_args.inspect %>
-          <% if a.size > 100 %>
-            <%= h(msg.display_args.inspect[0..100]) + "... " %>
-            <button data-toggle="collapse" data-target="#worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
-            <div class="toggle" id="worker_<%= index %>" style="display: none;"><%= h(msg.display_args) %></div>
+          <% a = msg.display_args %>
+          <% if a.inspect.size > 100 %>
+            <span class="worker_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
+            <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
+            <div class="toggle worker_<%= index %>"><%= display_args(a) %></div>
           <% else %>
-            <%= h(msg.display_args) %>
+            <%= display_args(msg.display_args) %>
           <% end %>
         </td>
         <td>
-          <form action="<%= root_path %>queues/<%= @name %>/delete" method="post">
+          <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
             <%= csrf_tag %>
-            <input name="key_val" value="<%= h Sidekiq.dump_json(msg.item) %>" type="hidden" />
+            <input name="key_val" value="<%= h msg.value %>" type="hidden" />
             <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
           </form>
         </td>
@@ -42,4 +43,4 @@
     <% end %>
   </table>
 </div>
-<%= erb :_paging, :locals => { :url => "#{root_path}queues/#{@name}" } %>
+<%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %>

data/web/views/queues.erb

@@ -5,19 +5,21 @@
     <thead>
       <th><%= t('Queue') %></th>
       <th><%= t('Size') %></th>
+      <th><%= t('Latency') %></th>
       <th><%= t('Actions') %></th>
     </thead>
     <% @queues.each do |queue| %>
       <tr>
         <td>
-          <a href="<%= root_path %>queues/<%= queue.name %>"><%= queue.name %></a>
+          <a href="<%= root_path %>queues/<%= CGI.escape(queue.name) %>"><%= h queue.name %></a>
           <% if queue.paused? %>
             <span class="label label-danger"><%= t('Paused') %></span>
           <% end %>
         </td>
         <td><%= number_with_delimiter(queue.size) %> </td>
-        <td width="20%">
-          <form action="<%=root_path %>queues/<%= queue.name %>" method="post">
+        <td><% queue_latency = queue.latency %><%= number_with_delimiter(queue_latency.round(2)) %><%= (queue_latency < 60) ? '' : " (#{relative_time(Time.at(Time.now.to_f - queue_latency))})" %> </td>
+        <td class="delete-confirm">
+          <form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
             <%= csrf_tag %>
             <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
           </form>