sidekiq 4.1.4 → 4.2.10

data/web/locales/fa.yml

@@ -0,0 +1,79 @@
+# elements like %{queue} are variables and should not be translated
+fa: # <---- change this to your locale code
+  Dashboard: داشبورد
+  Status: اعلان
+  Time: رمان
+  Namespace: فضای نام
+  Realtime: زنده
+  History: تاریخچه
+  Busy: مشغول
+  Processed: پردازش شده
+  Failed: ناموفق
+  Scheduled: زمان بندی
+  Retries: تکرار
+  Enqueued: صف بندی نشدند
+  Worker: کارگزار
+  LivePoll: Live Poll
+  StopPolling: Stop Polling
+  Queue: صف
+  Class: کلاس
+  Job: کار
+  Arguments: آرگومنت
+  Extras: اضافی
+  Started: شروع شده
+  ShowAll: نمایش همه
+  CurrentMessagesInQueue: کار فعلی در <span class='title'>%{queue}</span>
+  Delete: حذف
+  AddToQueue: افزودن به صف
+  AreYouSureDeleteJob: آیا شما مطمعن هستید از حذف این کار ؟
+  AreYouSureDeleteQueue: ایا شما مطمعنید از حذف %{queue} ?
+  Queues: صف ها
+  Size: سایز
+  Actions: اعمال
+  NextRetry: بار دیگر تلاش کنید
+  RetryCount: تعداد تلاش ها
+  RetryNow: تلاش مجدد
+  Kill: کشتن
+  LastRetry: آخرین تلاش
+  OriginallyFailed: Originally Failed
+  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: Polling interval
+  Plugins: پلاگین ها
+  NotYetEnqueued: بدون صف بندی
+  CreatedAt: ساخته شده در
+  BackToApp: برگشت به برنامه

data/web/views/_footer.erb

@@ -3,7 +3,7 @@
     <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" title="<%= redis_connection_and_namespace %>"><%= redis_connection_and_namespace %></p>

data/web/views/_job_info.erb

@@ -80,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/busy.erb

@@ -3,7 +3,7 @@
     <h3><%= t('Processes') %></h3>
   </div>
   <div class="col-sm-4 pull-right">
-    <form method="POST" style="margin-top: 20px; margin-bottom: 10px;">
+    <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" data-confirm="<%= t('AreYouSure') %>"><%= t('QuietAll') %></button>
@@ -24,7 +24,7 @@
     </thead>
     <% 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| %>

data/web/views/dashboard.erb

@@ -9,9 +9,9 @@
   </h3>
   <div class="interval-slider">
     <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

@@ -2,16 +2,16 @@
 <html>
   <head>
     <title><%= environment_title_prefix %><%= Sidekiq::NAME %></title>
+    <meta charset="utf8" />
     <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" />
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
     <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 +26,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,7 +47,9 @@
               <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 %>
@@ -57,14 +59,16 @@
     <input class="btn btn-danger btn-xs pull-left" 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" 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>
+  <% end %>
 
 <% else %>
   <div class="alert alert-success"><%= t('NoDeadJobsFound') %></div>

data/web/views/queue.erb

@@ -8,7 +8,7 @@
     </h3>
   </div>
   <div class="col-sm-4 pull-right">
-    <%= erb :_paging, :locals => { :url => "#{root_path}queues/#{@name}" } %>
+    <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
   </div>
 </header>
 <div class="table_container">
@@ -24,15 +24,15 @@
         <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>
+            <span class="worker_<%= index %>"><%= h(msg.display_args.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 %>"><%= h(msg.display_args) %></div>
           <% else %>
             <%= h(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 class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
@@ -42,4 +42,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

@@ -10,14 +10,14 @@
     <% @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 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>

data/web/views/retries.erb

@@ -4,7 +4,7 @@
   </div>
   <% if @retries.size > 0 && @total_size > @count %>
     <div class="col-sm-4">
-      <%= erb :_paging, :locals => { :url => "#{root_path}retries" } %>
+      <%= erb :_paging, locals: { url: "#{root_path}retries" } %>
     </div>
   <% end %>
   <%= filtering('retries') %>
@@ -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>
@@ -60,14 +60,16 @@
     <input class="btn btn-danger btn-xs pull-left" type="submit" name="kill" value="<%= t('Kill') %>" />
   </form>
 
-  <form action="<%= root_path %>retries/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 %>retries/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 %>retries/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 %>retries/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>
+  <% end %>
 
 <% else %>
   <div class="alert alert-success"><%= t('NoRetriesFound') %></div>

data/web/views/retry.erb

@@ -1,4 +1,4 @@
-<%= erb :_job_info, :locals => {:job => @retry, :type => :retry} %>
+<%= erb :_job_info, locals: { job: @retry, type: :retry } %>
 
 <h3><%= t('Error') %></h3>
 <div class="table_container">
@@ -7,7 +7,7 @@
       <tr>
         <th><%= t('ErrorClass') %></th>
         <td>
-          <code><%= h @retry.display_class %></code>
+          <code><%= h @retry['error_class'] %></code>
         </td>
       </tr>
       <tr>

data/web/views/scheduled.erb

@@ -4,7 +4,7 @@
   </div>
   <% if @scheduled.size > 0 && @total_size > @count %>
     <div class="col-sm-4">
-      <%= erb :_paging, :locals => { :url => "#{root_path}scheduled" } %>
+      <%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
     </div>
   <% end %>
   <%= filtering('scheduled') %>
@@ -18,7 +18,7 @@
       <table class="table table-striped table-bordered table-white">
         <thead>
           <tr>
-            <th width="20px">
+            <th class="checkbox-column">
               <input type="checkbox" class="check_all" />
             </th>
             <th><%= t('When') %></th>

data/web/views/scheduled_job_info.erb

@@ -1,4 +1,4 @@
-<%= erb :_job_info, :locals => {:job => @job, :type => :scheduled} %>
+<%= erb :_job_info, locals: { job: @job, type: :scheduled } %>
 
 <form class="form-horizontal" action="<%= root_path %>scheduled/<%= job_params(@job, @job.score) %>" method="post">
   <%= csrf_tag %>