sidekiq 6.2.1 → 6.2.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of sidekiq might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Changes.md +10 -0
- data/LICENSE +1 -1
- data/lib/sidekiq/api.rb +79 -56
- data/lib/sidekiq/extensions/generic_proxy.rb +3 -1
- data/lib/sidekiq/fetch.rb +1 -1
- data/lib/sidekiq/job.rb +8 -0
- data/lib/sidekiq/job_logger.rb +1 -1
- data/lib/sidekiq/job_retry.rb +3 -7
- data/lib/sidekiq/launcher.rb +13 -17
- data/lib/sidekiq/middleware/chain.rb +5 -3
- data/lib/sidekiq/scheduled.rb +7 -1
- data/lib/sidekiq/testing.rb +1 -3
- data/lib/sidekiq/version.rb +1 -1
- data/lib/sidekiq/web/action.rb +1 -1
- data/lib/sidekiq/web/application.rb +3 -3
- data/lib/sidekiq/web/helpers.rb +8 -9
- data/lib/sidekiq/web.rb +4 -3
- data/web/assets/stylesheets/application-dark.css +11 -24
- data/web/assets/stylesheets/application.css +15 -131
- data/web/locales/ar.yml +8 -2
- data/web/locales/en.yml +3 -0
- data/web/locales/es.yml +18 -2
- data/web/locales/fr.yml +7 -0
- data/web/locales/ja.yml +3 -0
- data/web/locales/lt.yml +1 -1
- data/web/views/_job_info.erb +1 -1
- data/web/views/busy.erb +5 -5
- data/web/views/dashboard.erb +14 -6
- data/web/views/dead.erb +1 -1
- data/web/views/morgue.erb +6 -6
- data/web/views/queues.erb +3 -3
- data/web/views/retries.erb +7 -7
- data/web/views/retry.erb +1 -1
- data/web/views/scheduled.erb +1 -1
- metadata +3 -2
data/web/locales/en.yml
CHANGED
@@ -7,6 +7,7 @@ en: # <---- change this to your locale code
|
|
7
7
|
Realtime: Real-time
|
8
8
|
History: History
|
9
9
|
Busy: Busy
|
10
|
+
Utilization: Utilization
|
10
11
|
Processed: Processed
|
11
12
|
Failed: Failed
|
12
13
|
Scheduled: Scheduled
|
@@ -64,7 +65,9 @@ en: # <---- change this to your locale code
|
|
64
65
|
DeadJobs: Dead Jobs
|
65
66
|
NoDeadJobsFound: No dead jobs were found
|
66
67
|
Dead: Dead
|
68
|
+
Process: Process
|
67
69
|
Processes: Processes
|
70
|
+
Name: Name
|
68
71
|
Thread: Thread
|
69
72
|
Threads: Threads
|
70
73
|
Jobs: Jobs
|
data/web/locales/es.yml
CHANGED
@@ -7,6 +7,7 @@ es:
|
|
7
7
|
Realtime: Tiempo Real
|
8
8
|
History: Historial
|
9
9
|
Busy: Ocupado
|
10
|
+
Utilization: Utilización
|
10
11
|
Processed: Procesadas
|
11
12
|
Failed: Fallidas
|
12
13
|
Scheduled: Programadas
|
@@ -24,9 +25,9 @@ es:
|
|
24
25
|
ShowAll: Mostrar Todo
|
25
26
|
CurrentMessagesInQueue: Mensajes actualmente en <span class='title'>%{queue}</span>
|
26
27
|
Delete: Eliminar
|
27
|
-
AddToQueue: Añadir a
|
28
|
+
AddToQueue: Añadir a la cola
|
28
29
|
AreYouSureDeleteJob: ¿Estás seguro de eliminar este trabajo?
|
29
|
-
AreYouSureDeleteQueue: ¿Estás seguro de eliminar la
|
30
|
+
AreYouSureDeleteQueue: ¿Estás seguro de eliminar la cola %{queue}?
|
30
31
|
Queues: Colas
|
31
32
|
Size: Tamaño
|
32
33
|
Actions: Acciones
|
@@ -39,6 +40,7 @@ es:
|
|
39
40
|
AreYouSure: ¿Estás seguro?
|
40
41
|
DeleteAll: Borrar Todo
|
41
42
|
RetryAll: Reintentar Todo
|
43
|
+
KillAll: Matar Todo
|
42
44
|
NoRetriesFound: No se encontraron reintentos
|
43
45
|
Error: Error
|
44
46
|
ErrorClass: Clase del Error
|
@@ -63,8 +65,22 @@ es:
|
|
63
65
|
DeadJobs: Trabajos muertos
|
64
66
|
NoDeadJobsFound: No hay trabajos muertos
|
65
67
|
Dead: Muerto
|
68
|
+
Process: Proceso
|
66
69
|
Processes: Procesos
|
70
|
+
Name: Nombre
|
67
71
|
Thread: Hilo
|
68
72
|
Threads: Hilos
|
69
73
|
Jobs: Trabajos
|
74
|
+
Paused: Pausado
|
75
|
+
Stop: Detener
|
76
|
+
Quiet: Silenciar
|
77
|
+
StopAll: Detener Todo
|
78
|
+
QuietAll: Silenciar Todo
|
79
|
+
PollingInterval: Intervalo de Sondeo
|
80
|
+
Plugins: Plugins
|
81
|
+
NotYetEnqueued: Aún no en cola
|
82
|
+
CreatedAt: Creado en
|
83
|
+
BackToApp: Volver a la Aplicación
|
70
84
|
Latency: Latencia
|
85
|
+
Pause: Pausar
|
86
|
+
Unpause: Reanudar
|
data/web/locales/fr.yml
CHANGED
@@ -7,6 +7,7 @@ fr:
|
|
7
7
|
Realtime: Temps réel
|
8
8
|
History: Historique
|
9
9
|
Busy: En cours
|
10
|
+
Utilization: Utilisation
|
10
11
|
Processed: Traitées
|
11
12
|
Failed: Échouées
|
12
13
|
Scheduled: Planifiées
|
@@ -39,6 +40,7 @@ fr:
|
|
39
40
|
AreYouSure: Êtes-vous certain ?
|
40
41
|
DeleteAll: Tout supprimer
|
41
42
|
RetryAll: Tout réessayer
|
43
|
+
KillAll: Tout tuer
|
42
44
|
NoRetriesFound: Aucune tâche à réessayer n’a été trouvée
|
43
45
|
Error: Erreur
|
44
46
|
ErrorClass: Classe d’erreur
|
@@ -63,6 +65,7 @@ fr:
|
|
63
65
|
DeadJobs: Tâches mortes
|
64
66
|
NoDeadJobsFound: Aucune tâche morte n'a été trouvée
|
65
67
|
Dead: Mortes
|
68
|
+
Process: Processus
|
66
69
|
Processes: Processus
|
67
70
|
Thread: Thread
|
68
71
|
Threads: Threads
|
@@ -76,3 +79,7 @@ fr:
|
|
76
79
|
Plugins: Plugins
|
77
80
|
NotYetEnqueued: Pas encore en file d'attente
|
78
81
|
CreatedAt: Créée le
|
82
|
+
Back to App: Retour à l'application
|
83
|
+
Latency: Latence
|
84
|
+
Pause: Pause
|
85
|
+
Unpause: Unpause
|
data/web/locales/ja.yml
CHANGED
@@ -7,6 +7,7 @@ ja:
|
|
7
7
|
Realtime: リアルタイム
|
8
8
|
History: 履歴
|
9
9
|
Busy: 実行中
|
10
|
+
Utilization: 使用率
|
10
11
|
Processed: 完了
|
11
12
|
Failed: 失敗
|
12
13
|
Scheduled: 予定
|
@@ -64,7 +65,9 @@ ja:
|
|
64
65
|
DeadJobs: デッドジョブ
|
65
66
|
NoDeadJobsFound: デッドジョブはありません
|
66
67
|
Dead: デッド
|
68
|
+
Process: プロセス
|
67
69
|
Processes: プロセス
|
70
|
+
Name: 名前
|
68
71
|
Thread: スレッド
|
69
72
|
Threads: スレッド
|
70
73
|
Jobs: ジョブ
|
data/web/locales/lt.yml
CHANGED
data/web/views/_job_info.erb
CHANGED
data/web/views/busy.erb
CHANGED
@@ -4,7 +4,7 @@
|
|
4
4
|
</div>
|
5
5
|
</div>
|
6
6
|
|
7
|
-
<div class="
|
7
|
+
<div class="stats-wrapper">
|
8
8
|
<div class="stats-container">
|
9
9
|
<div class="stat">
|
10
10
|
<h3><%= s = processes.size; number_with_delimiter(s) %></h3>
|
@@ -70,7 +70,7 @@
|
|
70
70
|
<% end %>
|
71
71
|
<br>
|
72
72
|
<b><%= "#{t('Queues')}: " %></b>
|
73
|
-
<%= process
|
73
|
+
<%= process.queues.join(", ") %>
|
74
74
|
</td>
|
75
75
|
<td><%= relative_time(Time.at(process['started_at'])) %></td>
|
76
76
|
<td><%= format_memory(process['rss'].to_i) %></td>
|
@@ -82,8 +82,8 @@
|
|
82
82
|
<input type="hidden" name="identity" value="<%= process['identity'] %>"/>
|
83
83
|
|
84
84
|
<div class="btn-group pull-right flip">
|
85
|
-
<% unless process.stopping? %><button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
|
86
|
-
<button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
|
85
|
+
<% unless process.stopping? %><button class="btn btn-xs btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
|
86
|
+
<button class="btn btn-xs btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
|
87
87
|
</div>
|
88
88
|
</form>
|
89
89
|
</td>
|
@@ -110,7 +110,7 @@
|
|
110
110
|
<th><%= t('Started') %></th>
|
111
111
|
</thead>
|
112
112
|
<% workers.each do |process, thread, msg| %>
|
113
|
-
<% job = Sidekiq::
|
113
|
+
<% job = Sidekiq::JobRecord.new(msg['payload']) %>
|
114
114
|
<tr>
|
115
115
|
<td><%= process %></td>
|
116
116
|
<td><%= thread %></td>
|
data/web/views/dashboard.erb
CHANGED
@@ -20,22 +20,30 @@
|
|
20
20
|
<div id="realtime-legend"></div>
|
21
21
|
</div>
|
22
22
|
|
23
|
-
<div class="row
|
24
|
-
|
25
|
-
|
23
|
+
<div class="row header">
|
24
|
+
<div class="col-sm-4 pull-left flip">
|
25
|
+
<h3><%= t('History') %></h3>
|
26
|
+
</div>
|
27
|
+
</div>
|
28
|
+
<div class="row chart">
|
29
|
+
<div>
|
26
30
|
<a href="<%= root_path %>?days=7" class="history-graph <%= "active" if params[:days] == "7" %>"><%= t('OneWeek') %></a>
|
27
31
|
<a href="<%= root_path %>" class="history-graph <%= "active" if params[:days].nil? || params[:days] == "30" %>"><%= t('OneMonth') %></a>
|
28
32
|
<a href="<%= root_path %>?days=90" class="history-graph <%= "active" if params[:days] == "90" %>"><%= t('ThreeMonths') %></a>
|
29
33
|
<a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
|
30
|
-
</
|
34
|
+
</div>
|
31
35
|
|
32
36
|
<div id="history" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>stats"></div>
|
33
37
|
<div id="history-legend"></div>
|
34
38
|
</div>
|
35
39
|
|
36
40
|
<br/>
|
37
|
-
<
|
38
|
-
<div class="
|
41
|
+
<div class="row header">
|
42
|
+
<div class="col-sm-4 pull-left flip">
|
43
|
+
<h3>Redis</h3>
|
44
|
+
</div>
|
45
|
+
</div>
|
46
|
+
<div class="stats-wrapper">
|
39
47
|
<div class="stats-container">
|
40
48
|
<% if @redis_info.fetch("redis_version", nil) %>
|
41
49
|
<div class="stat">
|
data/web/views/dead.erb
CHANGED
data/web/views/morgue.erb
CHANGED
@@ -14,7 +14,7 @@
|
|
14
14
|
<form action="<%= root_path %>morgue" method="post">
|
15
15
|
<%= csrf_tag %>
|
16
16
|
<div class="table_container">
|
17
|
-
<table class="table table-striped table-bordered">
|
17
|
+
<table class="table table-striped table-bordered table-hover">
|
18
18
|
<thead>
|
19
19
|
<tr>
|
20
20
|
<th class="table-checkbox checkbox-column">
|
@@ -44,7 +44,7 @@
|
|
44
44
|
</td>
|
45
45
|
<td>
|
46
46
|
<%= entry.display_class %>
|
47
|
-
<%= display_tags(entry, "
|
47
|
+
<%= display_tags(entry, "dead") %>
|
48
48
|
</td>
|
49
49
|
<td>
|
50
50
|
<div class="args"><%= display_args(entry.display_args) %></div>
|
@@ -58,18 +58,18 @@
|
|
58
58
|
<% end %>
|
59
59
|
</table>
|
60
60
|
</div>
|
61
|
-
<input class="btn btn-primary
|
62
|
-
<input class="btn btn-danger
|
61
|
+
<input class="btn btn-primary pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
|
62
|
+
<input class="btn btn-danger pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
|
63
63
|
</form>
|
64
64
|
|
65
65
|
<% unfiltered? do %>
|
66
66
|
<form action="<%= root_path %>morgue/all/delete" method="post">
|
67
67
|
<%= csrf_tag %>
|
68
|
-
<input class="btn btn-danger
|
68
|
+
<input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
69
69
|
</form>
|
70
70
|
<form action="<%= root_path %>morgue/all/retry" method="post">
|
71
71
|
<%= csrf_tag %>
|
72
|
-
<input class="btn btn-danger
|
72
|
+
<input class="btn btn-danger pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
73
73
|
</form>
|
74
74
|
<% end %>
|
75
75
|
|
data/web/views/queues.erb
CHANGED
@@ -21,13 +21,13 @@
|
|
21
21
|
<td class="delete-confirm">
|
22
22
|
<form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
|
23
23
|
<%= csrf_tag %>
|
24
|
-
<input class="btn btn-danger
|
24
|
+
<input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
|
25
25
|
|
26
26
|
<% if Sidekiq.pro? %>
|
27
27
|
<% if queue.paused? %>
|
28
|
-
<input class="btn btn-danger
|
28
|
+
<input class="btn btn-danger" type="submit" name="unpause" value="<%= t('Unpause') %>" />
|
29
29
|
<% else %>
|
30
|
-
<input class="btn btn-danger
|
30
|
+
<input class="btn btn-danger" type="submit" name="pause" value="<%= t('Pause') %>" />
|
31
31
|
<% end %>
|
32
32
|
<% end %>
|
33
33
|
</form>
|
data/web/views/retries.erb
CHANGED
@@ -14,7 +14,7 @@
|
|
14
14
|
<form action="<%= root_path %>retries" method="post">
|
15
15
|
<%= csrf_tag %>
|
16
16
|
<div class="table_container">
|
17
|
-
<table class="table table-striped table-bordered">
|
17
|
+
<table class="table table-striped table-bordered table-hover">
|
18
18
|
<thead>
|
19
19
|
<tr>
|
20
20
|
<th class="table-checkbox checkbox-column">
|
@@ -58,23 +58,23 @@
|
|
58
58
|
<% end %>
|
59
59
|
</table>
|
60
60
|
</div>
|
61
|
-
<input class="btn btn-primary
|
62
|
-
<input class="btn btn-danger
|
63
|
-
<input class="btn btn-danger
|
61
|
+
<input class="btn btn-primary pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
|
62
|
+
<input class="btn btn-danger pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
|
63
|
+
<input class="btn btn-danger pull-left flip" type="submit" name="kill" value="<%= t('Kill') %>" />
|
64
64
|
</form>
|
65
65
|
|
66
66
|
<% unfiltered? do %>
|
67
67
|
<form action="<%= root_path %>retries/all/delete" method="post">
|
68
68
|
<%= csrf_tag %>
|
69
|
-
<input class="btn btn-danger
|
69
|
+
<input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
70
70
|
</form>
|
71
71
|
<form action="<%= root_path %>retries/all/retry" method="post">
|
72
72
|
<%= csrf_tag %>
|
73
|
-
<input class="btn btn-danger
|
73
|
+
<input class="btn btn-danger pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
74
74
|
</form>
|
75
75
|
<form action="<%= root_path %>retries/all/kill" method="post">
|
76
76
|
<%= csrf_tag %>
|
77
|
-
<input class="btn btn-danger
|
77
|
+
<input class="btn btn-danger pull-right flip" type="submit" name="kill" value="<%= t('KillAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
78
78
|
</form>
|
79
79
|
<% end %>
|
80
80
|
|
data/web/views/retry.erb
CHANGED
data/web/views/scheduled.erb
CHANGED
@@ -15,7 +15,7 @@
|
|
15
15
|
<form action="<%= root_path %>scheduled" method="post">
|
16
16
|
<%= csrf_tag %>
|
17
17
|
<div class="table_container">
|
18
|
-
<table class="table table-striped table-bordered">
|
18
|
+
<table class="table table-striped table-bordered table-hover">
|
19
19
|
<thead>
|
20
20
|
<tr>
|
21
21
|
<th class="checkbox-column">
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sidekiq
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.2.
|
4
|
+
version: 6.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mike Perham
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-08-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: redis
|
@@ -82,6 +82,7 @@ files:
|
|
82
82
|
- lib/sidekiq/extensions/class_methods.rb
|
83
83
|
- lib/sidekiq/extensions/generic_proxy.rb
|
84
84
|
- lib/sidekiq/fetch.rb
|
85
|
+
- lib/sidekiq/job.rb
|
85
86
|
- lib/sidekiq/job_logger.rb
|
86
87
|
- lib/sidekiq/job_retry.rb
|
87
88
|
- lib/sidekiq/launcher.rb
|