sidekiq 6.0.0 → 6.1.1
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/.circleci/config.yml +13 -3
- data/6.0-Upgrade.md +3 -1
- data/Changes.md +155 -1
- data/Ent-Changes.md +27 -2
- data/Gemfile +2 -2
- data/Gemfile.lock +121 -109
- data/Pro-Changes.md +29 -2
- data/README.md +4 -5
- data/bin/sidekiq +26 -2
- data/bin/sidekiqload +8 -4
- data/bin/sidekiqmon +4 -5
- data/lib/generators/sidekiq/worker_generator.rb +11 -1
- data/lib/sidekiq/api.rb +130 -94
- data/lib/sidekiq/cli.rb +40 -24
- data/lib/sidekiq/client.rb +33 -12
- data/lib/sidekiq/extensions/active_record.rb +3 -2
- data/lib/sidekiq/extensions/class_methods.rb +5 -4
- data/lib/sidekiq/fetch.rb +26 -26
- data/lib/sidekiq/job_logger.rb +12 -4
- data/lib/sidekiq/job_retry.rb +23 -10
- data/lib/sidekiq/launcher.rb +35 -10
- data/lib/sidekiq/logger.rb +108 -12
- data/lib/sidekiq/manager.rb +3 -3
- data/lib/sidekiq/middleware/chain.rb +11 -2
- data/lib/sidekiq/monitor.rb +3 -18
- data/lib/sidekiq/paginator.rb +7 -2
- data/lib/sidekiq/processor.rb +22 -24
- data/lib/sidekiq/rails.rb +16 -18
- data/lib/sidekiq/redis_connection.rb +21 -13
- data/lib/sidekiq/scheduled.rb +13 -12
- data/lib/sidekiq/sd_notify.rb +149 -0
- data/lib/sidekiq/systemd.rb +24 -0
- data/lib/sidekiq/testing.rb +13 -1
- data/lib/sidekiq/util.rb +0 -2
- data/lib/sidekiq/version.rb +1 -1
- data/lib/sidekiq/web/application.rb +22 -21
- data/lib/sidekiq/web/csrf_protection.rb +153 -0
- data/lib/sidekiq/web/helpers.rb +25 -16
- data/lib/sidekiq/web/router.rb +2 -4
- data/lib/sidekiq/web.rb +16 -8
- data/lib/sidekiq/worker.rb +8 -11
- data/lib/sidekiq.rb +21 -7
- data/sidekiq.gemspec +3 -4
- data/web/assets/javascripts/application.js +25 -27
- data/web/assets/javascripts/dashboard.js +2 -2
- data/web/assets/stylesheets/application-dark.css +133 -0
- data/web/assets/stylesheets/application.css +14 -0
- data/web/locales/de.yml +14 -2
- data/web/locales/en.yml +2 -0
- data/web/locales/fr.yml +2 -2
- data/web/locales/ja.yml +2 -0
- data/web/locales/lt.yml +83 -0
- data/web/locales/pl.yml +4 -4
- data/web/locales/vi.yml +83 -0
- data/web/views/_job_info.erb +2 -1
- data/web/views/busy.erb +4 -1
- data/web/views/dead.erb +2 -2
- data/web/views/layout.erb +1 -0
- data/web/views/morgue.erb +4 -1
- data/web/views/queue.erb +10 -1
- data/web/views/queues.erb +8 -0
- data/web/views/retries.erb +4 -1
- data/web/views/retry.erb +2 -2
- data/web/views/scheduled.erb +4 -1
- metadata +16 -24
@@ -27,7 +27,7 @@ var realtimeGraph = function(updatePath) {
|
|
27
27
|
renderer: 'line',
|
28
28
|
interpolation: 'linear',
|
29
29
|
|
30
|
-
series: new Rickshaw.Series.FixedDuration([{ name: graphElement.dataset.failedLabel, color: '#
|
30
|
+
series: new Rickshaw.Series.FixedDuration([{ name: graphElement.dataset.failedLabel, color: '#af0014' }, { name: graphElement.dataset.processedLabel, color: '#006f68' }], undefined, {
|
31
31
|
timeInterval: timeInterval,
|
32
32
|
maxDataPoints: 100,
|
33
33
|
})
|
@@ -125,7 +125,7 @@ var historyGraph = function() {
|
|
125
125
|
interpolation: 'linear',
|
126
126
|
series: [
|
127
127
|
{
|
128
|
-
color: "#
|
128
|
+
color: "#af0014",
|
129
129
|
data: failed,
|
130
130
|
name: graphElement.dataset.failedLabel
|
131
131
|
}, {
|
@@ -0,0 +1,133 @@
|
|
1
|
+
html, body {
|
2
|
+
background-color: #070707 !important;
|
3
|
+
color: #ccc;
|
4
|
+
}
|
5
|
+
|
6
|
+
a,
|
7
|
+
.title,
|
8
|
+
.summary_bar ul .count,
|
9
|
+
.navbar .navbar-brand {
|
10
|
+
color: #af0014;
|
11
|
+
}
|
12
|
+
|
13
|
+
.navbar .navbar-brand:hover {
|
14
|
+
color: #ccc;
|
15
|
+
}
|
16
|
+
|
17
|
+
.navbar .navbar-brand .status {
|
18
|
+
color: #ccc;
|
19
|
+
}
|
20
|
+
|
21
|
+
.navbar-inverse {
|
22
|
+
background-color: #000;
|
23
|
+
border-color: #333;
|
24
|
+
}
|
25
|
+
|
26
|
+
table.table-white {
|
27
|
+
background-color: #111;
|
28
|
+
}
|
29
|
+
|
30
|
+
.table-striped > tbody > tr:nth-of-type(odd) {
|
31
|
+
background-color: #222;
|
32
|
+
}
|
33
|
+
|
34
|
+
.table-bordered,
|
35
|
+
.table-bordered > tbody > tr > td,
|
36
|
+
.table-bordered > tbody > tr > th,
|
37
|
+
.table-bordered > tfoot > tr > td,
|
38
|
+
.table-bordered > tfoot > tr > th,
|
39
|
+
.table-bordered > thead > tr > td,
|
40
|
+
.table-bordered > thead > tr > th {
|
41
|
+
border: 1px solid #333;
|
42
|
+
}
|
43
|
+
|
44
|
+
.table-hover > tbody > tr:hover {
|
45
|
+
background-color: #333;
|
46
|
+
}
|
47
|
+
|
48
|
+
.alert {
|
49
|
+
border: none;
|
50
|
+
color: #ccc;
|
51
|
+
}
|
52
|
+
|
53
|
+
.alert-success {
|
54
|
+
background-color: #182d11;
|
55
|
+
}
|
56
|
+
|
57
|
+
a:link,
|
58
|
+
a:active,
|
59
|
+
a:hover,
|
60
|
+
a:visited {
|
61
|
+
color: #63798c;
|
62
|
+
}
|
63
|
+
|
64
|
+
a.btn {
|
65
|
+
color: #000;
|
66
|
+
}
|
67
|
+
|
68
|
+
.summary_bar .summary {
|
69
|
+
background-color: #111;
|
70
|
+
border: 1px solid #333;
|
71
|
+
|
72
|
+
-webkit-box-shadow: 0 0 5px rgba(255, 255, 255, 0.1);
|
73
|
+
-moz-box-shadow: 0 0 5px rgba(255, 255, 255, 0.1);
|
74
|
+
box-shadow: 0 0 5px rgba(255, 255, 255, 0.1);
|
75
|
+
}
|
76
|
+
|
77
|
+
.navbar-default {
|
78
|
+
background-color: #000;
|
79
|
+
border-color: #3d3d3d;
|
80
|
+
}
|
81
|
+
|
82
|
+
.navbar-default .navbar-nav > .active > a,
|
83
|
+
.navbar-default .navbar-nav > .active > a:focus,
|
84
|
+
.navbar-default .navbar-nav > .active > a:hover {
|
85
|
+
color: #ccc;
|
86
|
+
background-color: #282828;
|
87
|
+
}
|
88
|
+
|
89
|
+
.navbar-default .navbar-nav > li > a:hover {
|
90
|
+
color: #ccc;
|
91
|
+
}
|
92
|
+
|
93
|
+
.pagination > li > a,
|
94
|
+
.pagination > li > a:hover,
|
95
|
+
.pagination > li > span {
|
96
|
+
color: #ccc;
|
97
|
+
background-color: #282828;
|
98
|
+
border-color: #353535;
|
99
|
+
}
|
100
|
+
.pagination > .disabled > a,
|
101
|
+
.pagination > .disabled > a:focus,
|
102
|
+
.pagination > .disabled > a:hover,
|
103
|
+
.pagination > .disabled > span,
|
104
|
+
.pagination > .disabled > span:focus,
|
105
|
+
.pagination > .disabled > span:hover {
|
106
|
+
color: #a5a5a5;
|
107
|
+
background-color: #282828;
|
108
|
+
border-color: #353535;
|
109
|
+
}
|
110
|
+
|
111
|
+
.stat {
|
112
|
+
border: 1px solid rgba(255, 255, 255, 0.1);
|
113
|
+
}
|
114
|
+
|
115
|
+
#live-poll {
|
116
|
+
color: #ccc;
|
117
|
+
}
|
118
|
+
|
119
|
+
.btn-warn {
|
120
|
+
color: #333;
|
121
|
+
}
|
122
|
+
|
123
|
+
.rickshaw_graph .detail {
|
124
|
+
background: rgba(255, 255, 255, .1)
|
125
|
+
}
|
126
|
+
.rickshaw_graph .x_tick {
|
127
|
+
border-color: rgba(255, 255, 255, .2);
|
128
|
+
}
|
129
|
+
|
130
|
+
.rickshaw_graph .y_ticks.glow text {
|
131
|
+
fill: #ccc;
|
132
|
+
color: #ccc;
|
133
|
+
}
|
@@ -201,6 +201,15 @@ td form {
|
|
201
201
|
padding: 0;
|
202
202
|
}
|
203
203
|
|
204
|
+
.jobtag a {
|
205
|
+
color: white;
|
206
|
+
}
|
207
|
+
|
208
|
+
.jobtag a:hover {
|
209
|
+
color: white;
|
210
|
+
text-decoration: underline;
|
211
|
+
}
|
212
|
+
|
204
213
|
table .table-checkbox label {
|
205
214
|
height: 100%;
|
206
215
|
width: 100%;
|
@@ -460,6 +469,11 @@ span.current-interval {
|
|
460
469
|
|
461
470
|
div.interval-slider input {
|
462
471
|
width: 160px;
|
472
|
+
-webkit-appearance: none;
|
473
|
+
height: 3px;
|
474
|
+
margin-top: 5px;
|
475
|
+
border-radius: 2px;
|
476
|
+
background: currentcolor;
|
463
477
|
}
|
464
478
|
|
465
479
|
#realtime-legend,
|
data/web/locales/de.yml
CHANGED
@@ -13,7 +13,7 @@ de:
|
|
13
13
|
Retries: Versuche
|
14
14
|
Enqueued: In der Warteschlange
|
15
15
|
Worker: Arbeiter
|
16
|
-
LivePoll:
|
16
|
+
LivePoll: Echtzeitabfrage
|
17
17
|
StopPolling: Abfrage stoppen
|
18
18
|
Queue: Warteschlange
|
19
19
|
Class: Klasse
|
@@ -33,12 +33,13 @@ de:
|
|
33
33
|
NextRetry: Nächster Versuch
|
34
34
|
RetryCount: Anzahl der Versuche
|
35
35
|
RetryNow: Jetzt erneut versuchen
|
36
|
-
Kill:
|
36
|
+
Kill: Vernichten
|
37
37
|
LastRetry: Letzter Versuch
|
38
38
|
OriginallyFailed: Ursprünglich fehlgeschlagen
|
39
39
|
AreYouSure: Bist du sicher?
|
40
40
|
DeleteAll: Alle löschen
|
41
41
|
RetryAll: Alle erneut versuchen
|
42
|
+
KillAll: Alle vernichten
|
42
43
|
NoRetriesFound: Keine erneuten Versuche gefunden
|
43
44
|
Error: Fehler
|
44
45
|
ErrorClass: Fehlerklasse
|
@@ -67,3 +68,14 @@ de:
|
|
67
68
|
Thread: Thread
|
68
69
|
Threads: Threads
|
69
70
|
Jobs: Jobs
|
71
|
+
Paused: Pausiert
|
72
|
+
Stop: Stopp
|
73
|
+
Quiet: Leise
|
74
|
+
StopAll: Alle stoppen
|
75
|
+
QuietAll: Alle leise
|
76
|
+
PollingInterval: Abfrageintervall
|
77
|
+
Plugins: Erweiterungen
|
78
|
+
NotYetEnqueued: Noch nicht in der Warteschlange
|
79
|
+
CreatedAt: Erstellt
|
80
|
+
BackToApp: Zurück zur Anwendung
|
81
|
+
Latency: Latenz
|
data/web/locales/en.yml
CHANGED
data/web/locales/fr.yml
CHANGED
@@ -69,9 +69,9 @@ fr:
|
|
69
69
|
Jobs: Tâches
|
70
70
|
Paused: Mise en pause
|
71
71
|
Stop: Arrêter
|
72
|
-
Quiet:
|
72
|
+
Quiet: Clore
|
73
73
|
StopAll: Tout arrêter
|
74
|
-
QuietAll: Tout
|
74
|
+
QuietAll: Tout clore
|
75
75
|
PollingInterval: Interval de rafraîchissement
|
76
76
|
Plugins: Plugins
|
77
77
|
NotYetEnqueued: Pas encore en file d'attente
|
data/web/locales/ja.yml
CHANGED
data/web/locales/lt.yml
ADDED
@@ -0,0 +1,83 @@
|
|
1
|
+
# elements like %{queue} are variables and should not be translated
|
2
|
+
lt:
|
3
|
+
Dashboard: Valdymo skydas
|
4
|
+
Status: Būsena
|
5
|
+
Time: Laikas
|
6
|
+
Namespace: Vardų erdvė
|
7
|
+
Realtime: Realiu laiku
|
8
|
+
History: Istorija
|
9
|
+
Busy: Užimti
|
10
|
+
Processed: Įvykdyti
|
11
|
+
Failed: Nepavykę
|
12
|
+
Scheduled: Suplanuoti
|
13
|
+
Retries: Kartojami
|
14
|
+
Enqueued: Eilėje
|
15
|
+
Worker: Darbuotojas
|
16
|
+
LivePoll: Užklausti gyvai
|
17
|
+
StopPolling: Stabdyti užklausas
|
18
|
+
Queue: Eilė
|
19
|
+
Class: Klasė
|
20
|
+
Job: Darbas
|
21
|
+
Arguments: Parametrai
|
22
|
+
Extras: Papildomi
|
23
|
+
Started: Pradėti
|
24
|
+
ShowAll: Rodyti Visus
|
25
|
+
CurrentMessagesInQueue: Esami darbai eilėje <span class='title'>%{queue}</span>
|
26
|
+
Delete: Pašalinti
|
27
|
+
AddToQueue: Pridėti į eilę
|
28
|
+
AreYouSureDeleteJob: Ar tikrai norite pašalinti šį darbą?
|
29
|
+
AreYouSureDeleteQueue: Ar tikrai norite pašalinti šią eilę %{queue}?
|
30
|
+
Queues: Eilės
|
31
|
+
Size: Dydis
|
32
|
+
Actions: Veiksmai
|
33
|
+
NextRetry: Sekantis Kartojimas
|
34
|
+
RetryCount: Kartojimų Skaičius
|
35
|
+
RetryNow: Kartoti Dabar
|
36
|
+
Kill: Priverstinai Nutraukti
|
37
|
+
LastRetry: Paskutinis Kartojimas
|
38
|
+
OriginallyFailed: Iš pradžių Nepavykę
|
39
|
+
AreYouSure: Ar jūs įsitikinę?
|
40
|
+
DeleteAll: Pašalinti Visus
|
41
|
+
RetryAll: Kartoti Visus
|
42
|
+
KillAll: Priverstinai Nutraukti Visus
|
43
|
+
NoRetriesFound: Nerasta kartojimų
|
44
|
+
Error: Klaida
|
45
|
+
ErrorClass: Klaidos Klasė
|
46
|
+
ErrorMessage: Klaidos Žinutė
|
47
|
+
ErrorBacktrace: Klaidos Pėdsakai
|
48
|
+
GoBack: ← Atgal
|
49
|
+
NoScheduledFound: Planuojamų darbų nerasta
|
50
|
+
When: Kada
|
51
|
+
ScheduledJobs: Planuojami Darbai
|
52
|
+
idle: neveiksnus
|
53
|
+
active: aktyvus
|
54
|
+
Version: Versija
|
55
|
+
Connections: Ryšiai
|
56
|
+
MemoryUsage: Atminties Vartojimas
|
57
|
+
PeakMemoryUsage: Atminties Vartojimo Pikas
|
58
|
+
Uptime: Gyvavimo laikas (dienomis)
|
59
|
+
OneWeek: 1 savaitė
|
60
|
+
OneMonth: 1 mėnuo
|
61
|
+
ThreeMonths: 3 mėnesiai
|
62
|
+
SixMonths: 6 mėnesiai
|
63
|
+
Failures: Nesėkmingi vykdymai
|
64
|
+
DeadJobs: Negyvi Darbai
|
65
|
+
NoDeadJobsFound: Negyvų darbų nerasta
|
66
|
+
Dead: Negyvi
|
67
|
+
Processes: Procesai
|
68
|
+
Thread: Gija
|
69
|
+
Threads: Gijos
|
70
|
+
Jobs: Darbai
|
71
|
+
Paused: Pristabdytas
|
72
|
+
Stop: Sustabdyti
|
73
|
+
Quiet: Nutildyti
|
74
|
+
StopAll: Sustbadyti Visus
|
75
|
+
QuietAll: Nutildyti Visus
|
76
|
+
PollingInterval: Užklausimų intervalas
|
77
|
+
Plugins: Įskiepiai
|
78
|
+
NotYetEnqueued: Dar neįtraukti į eilę
|
79
|
+
CreatedAt: Sukurta
|
80
|
+
BackToApp: Atgal į Aplikaciją
|
81
|
+
Latency: Vėlavimas
|
82
|
+
Pause: Pristabdyti
|
83
|
+
Unpause: Pratęsti
|
data/web/locales/pl.yml
CHANGED
@@ -10,7 +10,7 @@ pl:
|
|
10
10
|
Processed: Ukończone
|
11
11
|
Failed: Nieudane
|
12
12
|
Scheduled: Zaplanowane
|
13
|
-
Retries:
|
13
|
+
Retries: Do ponowienia
|
14
14
|
Enqueued: Zakolejkowane
|
15
15
|
Worker: Worker
|
16
16
|
LivePoll: Wczytuj na żywo
|
@@ -29,15 +29,15 @@ pl:
|
|
29
29
|
Queues: Kolejki
|
30
30
|
Size: Rozmiar
|
31
31
|
Actions: Akcje
|
32
|
-
NextRetry:
|
33
|
-
RetryCount:
|
32
|
+
NextRetry: Następne ponowienie
|
33
|
+
RetryCount: Ilość ponowień
|
34
34
|
RetryNow: Ponów teraz
|
35
35
|
LastRetry: Ostatnie ponowienie
|
36
36
|
OriginallyFailed: Ostatnio nieudane
|
37
37
|
AreYouSure: Na pewno?
|
38
38
|
DeleteAll: Usuń wszystko
|
39
39
|
RetryAll: Powtórz wszystko
|
40
|
-
NoRetriesFound: Brak
|
40
|
+
NoRetriesFound: Brak zadań do ponowienia
|
41
41
|
Error: Błąd
|
42
42
|
ErrorClass: Klasa błędu
|
43
43
|
ErrorMessage: Wiadomosć błędu
|
data/web/locales/vi.yml
ADDED
@@ -0,0 +1,83 @@
|
|
1
|
+
# elements like %{queue} are variables and should not be translated
|
2
|
+
vi: # <---- change this to your locale code
|
3
|
+
Dashboard: Bảng điều khiển
|
4
|
+
Status: Trạng thái
|
5
|
+
Time: Thời gian
|
6
|
+
Namespace: Không gian tên
|
7
|
+
Realtime: Thời gian thực
|
8
|
+
History: Lịch sử
|
9
|
+
Busy: Bận rộn
|
10
|
+
Processed: Đã xử lí
|
11
|
+
Failed: Đã thất bại
|
12
|
+
Scheduled: Đã lên lịch
|
13
|
+
Retries: Số lần thử
|
14
|
+
Enqueued: Đã xếp hàng đợi
|
15
|
+
Worker: Máy xử lí
|
16
|
+
LivePoll: Thăm dò trực tiếp
|
17
|
+
StopPolling: Ngừng thăm dò
|
18
|
+
Queue: Hàng đợi
|
19
|
+
Class: Lớp
|
20
|
+
Job: Tác vụ
|
21
|
+
Arguments: Tham số
|
22
|
+
Extras: Thêm
|
23
|
+
Started: Đã bắt đầu
|
24
|
+
ShowAll: Hiện tất cả
|
25
|
+
CurrentMessagesInQueue: Số lượng công việc trong <span class='title'>%{queue}</span>
|
26
|
+
Delete: Xóa
|
27
|
+
AddToQueue: Thêm vào hàng đợi
|
28
|
+
AreYouSureDeleteJob: Bạn có chắc là muốn xóa tác vụ này?
|
29
|
+
AreYouSureDeleteQueue: Bạn có chắc là muốn xóa %{queue} này?
|
30
|
+
Queues: Các hàng đợi
|
31
|
+
Size: Kích thước
|
32
|
+
Actions: Những hành động
|
33
|
+
NextRetry: Lần thử lại tiếp theo
|
34
|
+
RetryCount: Số lần thử lại
|
35
|
+
RetryNow: Thử lại ngay bây giờ
|
36
|
+
Kill: Giết
|
37
|
+
LastRetry: Lần thử cuối
|
38
|
+
OriginallyFailed: Đã thất bại từ đầu
|
39
|
+
AreYouSure: Bạn chắc chứ?
|
40
|
+
DeleteAll: Xóa hết
|
41
|
+
RetryAll: Thử lại tất cả
|
42
|
+
KillAll: Giết hết
|
43
|
+
NoRetriesFound: Không có lần thử nào được tìm thấy
|
44
|
+
Error: Lỗi
|
45
|
+
ErrorClass: Lớp lỗi
|
46
|
+
ErrorMessage: Tin nhắn lỗi
|
47
|
+
ErrorBacktrace: Dấu vết của lỗi
|
48
|
+
GoBack: ← Trở lại
|
49
|
+
NoScheduledFound: Không có tác vụ đã lên lịch nào được tìm thấy
|
50
|
+
When: Khi nào
|
51
|
+
ScheduledJobs: Những Tác Vụ Được Hẹn
|
52
|
+
idle: Đang chờ
|
53
|
+
active: Đang hoạt động
|
54
|
+
Version: Phiên bản
|
55
|
+
Connections: Các kết nối
|
56
|
+
MemoryUsage: Lượng bộ nhớ sử dụng
|
57
|
+
PeakMemoryUsage: Lượng bộ nhớ sử dụng đỉnh điểm
|
58
|
+
Uptime: Thời gian hệ thống đã online (days)
|
59
|
+
OneWeek: 1 tuần
|
60
|
+
OneMonth: 1 tháng
|
61
|
+
ThreeMonths: 3 tháng
|
62
|
+
SixMonths: 6 tháng
|
63
|
+
Failures: Các thất bại
|
64
|
+
DeadJobs: Những tác vụ đã chết
|
65
|
+
NoDeadJobsFound: Không có tác vụ đã chết nào được tìm thấy
|
66
|
+
Dead: Chết
|
67
|
+
Processes: Tiến trình xử lí
|
68
|
+
Thread: Luồng xử lí
|
69
|
+
Threads: Những luồng xử lí
|
70
|
+
Jobs: Các tác vụ
|
71
|
+
Paused: Đã tạm dừng
|
72
|
+
Stop: Dừng Lại
|
73
|
+
Quiet: Im lặng
|
74
|
+
StopAll: Dừng lại tất cả
|
75
|
+
QuietAll: Làm cho tất cả im lặng
|
76
|
+
PollingInterval: Khoảng thời gian giữa các lần thăm dò
|
77
|
+
Plugins: Hệ thống đính kèm
|
78
|
+
NotYetEnqueued: Chưa được bỏ vào hàng đợi
|
79
|
+
CreatedAt: Được tạo vào lúc
|
80
|
+
BackToApp: Trở về ứng dụng
|
81
|
+
Latency: Độ trễ
|
82
|
+
Pause: Tạm dừng
|
83
|
+
Unpause: Hủy tạm dừng
|
data/web/views/_job_info.erb
CHANGED
data/web/views/busy.erb
CHANGED
@@ -87,7 +87,10 @@
|
|
87
87
|
<td>
|
88
88
|
<a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
|
89
89
|
</td>
|
90
|
-
<td
|
90
|
+
<td>
|
91
|
+
<%= job.display_class %>
|
92
|
+
<%= display_tags(job, nil) %>
|
93
|
+
</td>
|
91
94
|
<td>
|
92
95
|
<div class="args"><%= display_args(job.display_args) %></div>
|
93
96
|
</td>
|
data/web/views/dead.erb
CHANGED
@@ -14,11 +14,11 @@
|
|
14
14
|
<th><%= t('ErrorMessage') %></th>
|
15
15
|
<td><%= h(@dead['error_message']) %></td>
|
16
16
|
</tr>
|
17
|
-
<% if
|
17
|
+
<% if @dead.error_backtrace %>
|
18
18
|
<tr>
|
19
19
|
<th><%= t('ErrorBacktrace') %></th>
|
20
20
|
<td>
|
21
|
-
<code><%= @dead
|
21
|
+
<code><%= @dead.error_backtrace.join("<br/>") %></code>
|
22
22
|
</td>
|
23
23
|
</tr>
|
24
24
|
<% end %>
|
data/web/views/layout.erb
CHANGED
@@ -11,6 +11,7 @@
|
|
11
11
|
<% end %>
|
12
12
|
|
13
13
|
<link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
|
14
|
+
<link href="<%= root_path %>stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
|
14
15
|
<% if rtl? %>
|
15
16
|
<link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
|
16
17
|
<% end %>
|
data/web/views/morgue.erb
CHANGED
@@ -42,7 +42,10 @@
|
|
42
42
|
<td>
|
43
43
|
<a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
|
44
44
|
</td>
|
45
|
-
<td
|
45
|
+
<td>
|
46
|
+
<%= entry.display_class %>
|
47
|
+
<%= display_tags(entry, "morgue") %>
|
48
|
+
</td>
|
46
49
|
<td>
|
47
50
|
<div class="args"><%= display_args(entry.display_args) %></div>
|
48
51
|
</td>
|
data/web/views/queue.erb
CHANGED
@@ -15,13 +15,22 @@
|
|
15
15
|
<div class="table_container">
|
16
16
|
<table class="queue table table-hover table-bordered table-striped">
|
17
17
|
<thead>
|
18
|
+
<th><a href="<%= url %>?direction=<%= params[:direction] == 'asc' ? 'desc' : 'asc' %>"># <%= sort_direction_label %></a></th>
|
18
19
|
<th><%= t('Job') %></th>
|
19
20
|
<th><%= t('Arguments') %></th>
|
20
21
|
<th></th>
|
21
22
|
</thead>
|
22
23
|
<% @messages.each_with_index do |msg, index| %>
|
23
24
|
<tr>
|
24
|
-
|
25
|
+
<% if params[:direction] == 'asc' %>
|
26
|
+
<td><%= @count * (@current_page - 1) + index + 1 %></td>
|
27
|
+
<% else %>
|
28
|
+
<td><%= @total_size - (@count * (@current_page - 1) + index) %></td>
|
29
|
+
<% end %>
|
30
|
+
<td>
|
31
|
+
<%= h(msg.display_class) %>
|
32
|
+
<%= display_tags(msg, nil) %>
|
33
|
+
</td>
|
25
34
|
<td>
|
26
35
|
<% a = msg.display_args %>
|
27
36
|
<% if a.inspect.size > 100 %>
|
data/web/views/queues.erb
CHANGED
@@ -22,6 +22,14 @@
|
|
22
22
|
<form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
|
23
23
|
<%= csrf_tag %>
|
24
24
|
<input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
|
25
|
+
|
26
|
+
<% if Sidekiq.pro? %>
|
27
|
+
<% if queue.paused? %>
|
28
|
+
<input class="btn btn-danger btn-xs" type="submit" name="unpause" value="<%= t('Unpause') %>" />
|
29
|
+
<% else %>
|
30
|
+
<input class="btn btn-danger btn-xs" type="submit" name="pause" value="<%= t('Pause') %>" />
|
31
|
+
<% end %>
|
32
|
+
<% end %>
|
25
33
|
</form>
|
26
34
|
</td>
|
27
35
|
</tr>
|
data/web/views/retries.erb
CHANGED
@@ -44,7 +44,10 @@
|
|
44
44
|
<td>
|
45
45
|
<a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
|
46
46
|
</td>
|
47
|
-
<td
|
47
|
+
<td>
|
48
|
+
<%= entry.display_class %>
|
49
|
+
<%= display_tags(entry, "retries") %>
|
50
|
+
</td>
|
48
51
|
<td>
|
49
52
|
<div class="args"><%= display_args(entry.display_args) %></div>
|
50
53
|
</td>
|
data/web/views/retry.erb
CHANGED
@@ -14,11 +14,11 @@
|
|
14
14
|
<th><%= t('ErrorMessage') %></th>
|
15
15
|
<td><%= h(@retry['error_message']) %></td>
|
16
16
|
</tr>
|
17
|
-
<% if
|
17
|
+
<% if @retry.error_backtrace %>
|
18
18
|
<tr>
|
19
19
|
<th><%= t('ErrorBacktrace') %></th>
|
20
20
|
<td>
|
21
|
-
<code><%= @retry
|
21
|
+
<code><%= @retry.error_backtrace.join("<br/>") %></code>
|
22
22
|
</td>
|
23
23
|
</tr>
|
24
24
|
<% end %>
|
data/web/views/scheduled.erb
CHANGED
@@ -38,7 +38,10 @@
|
|
38
38
|
<td>
|
39
39
|
<a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
|
40
40
|
</td>
|
41
|
-
<td
|
41
|
+
<td>
|
42
|
+
<%= entry.display_class %>
|
43
|
+
<%= display_tags(entry, "scheduled") %>
|
44
|
+
</td>
|
42
45
|
<td>
|
43
46
|
<div class="args"><%= display_args(entry.display_args) %></div>
|
44
47
|
</td>
|