sidekiq 6.4.1 → 7.0.7
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 +172 -12
- data/README.md +41 -33
- data/bin/sidekiq +3 -8
- data/bin/sidekiqload +188 -114
- data/bin/sidekiqmon +3 -0
- data/lib/sidekiq/api.rb +275 -161
- data/lib/sidekiq/capsule.rb +127 -0
- data/lib/sidekiq/cli.rb +83 -88
- data/lib/sidekiq/client.rb +55 -43
- data/lib/sidekiq/component.rb +68 -0
- data/lib/sidekiq/config.rb +270 -0
- data/lib/sidekiq/deploy.rb +62 -0
- data/lib/sidekiq/embedded.rb +61 -0
- data/lib/sidekiq/fetch.rb +21 -22
- data/lib/sidekiq/job.rb +375 -10
- data/lib/sidekiq/job_logger.rb +2 -2
- data/lib/sidekiq/job_retry.rb +76 -54
- data/lib/sidekiq/job_util.rb +59 -19
- data/lib/sidekiq/launcher.rb +90 -82
- data/lib/sidekiq/logger.rb +6 -45
- data/lib/sidekiq/manager.rb +33 -32
- data/lib/sidekiq/metrics/query.rb +153 -0
- data/lib/sidekiq/metrics/shared.rb +95 -0
- data/lib/sidekiq/metrics/tracking.rb +136 -0
- data/lib/sidekiq/middleware/chain.rb +96 -51
- data/lib/sidekiq/middleware/current_attributes.rb +16 -17
- data/lib/sidekiq/middleware/i18n.rb +6 -4
- data/lib/sidekiq/middleware/modules.rb +21 -0
- data/lib/sidekiq/monitor.rb +17 -4
- data/lib/sidekiq/paginator.rb +11 -3
- data/lib/sidekiq/processor.rb +60 -60
- data/lib/sidekiq/rails.rb +12 -10
- data/lib/sidekiq/redis_client_adapter.rb +115 -0
- data/lib/sidekiq/redis_connection.rb +13 -82
- data/lib/sidekiq/ring_buffer.rb +29 -0
- data/lib/sidekiq/scheduled.rb +65 -37
- data/lib/sidekiq/testing/inline.rb +4 -4
- data/lib/sidekiq/testing.rb +41 -68
- data/lib/sidekiq/transaction_aware_client.rb +44 -0
- data/lib/sidekiq/version.rb +2 -1
- data/lib/sidekiq/web/action.rb +3 -3
- data/lib/sidekiq/web/application.rb +40 -9
- data/lib/sidekiq/web/csrf_protection.rb +3 -3
- data/lib/sidekiq/web/helpers.rb +34 -20
- data/lib/sidekiq/web.rb +7 -14
- data/lib/sidekiq/worker_compatibility_alias.rb +13 -0
- data/lib/sidekiq.rb +84 -207
- data/sidekiq.gemspec +20 -10
- data/web/assets/javascripts/application.js +76 -26
- data/web/assets/javascripts/base-charts.js +106 -0
- data/web/assets/javascripts/chart.min.js +13 -0
- data/web/assets/javascripts/chartjs-plugin-annotation.min.js +7 -0
- data/web/assets/javascripts/dashboard-charts.js +166 -0
- data/web/assets/javascripts/dashboard.js +3 -240
- data/web/assets/javascripts/metrics.js +264 -0
- data/web/assets/stylesheets/application-dark.css +4 -0
- data/web/assets/stylesheets/application-rtl.css +2 -91
- data/web/assets/stylesheets/application.css +66 -299
- data/web/locales/ar.yml +70 -70
- data/web/locales/cs.yml +62 -62
- data/web/locales/da.yml +60 -53
- data/web/locales/de.yml +65 -65
- data/web/locales/el.yml +43 -24
- data/web/locales/en.yml +82 -69
- data/web/locales/es.yml +68 -68
- data/web/locales/fa.yml +65 -65
- data/web/locales/fr.yml +67 -67
- data/web/locales/he.yml +65 -64
- data/web/locales/hi.yml +59 -59
- data/web/locales/it.yml +53 -53
- data/web/locales/ja.yml +73 -68
- data/web/locales/ko.yml +52 -52
- data/web/locales/lt.yml +66 -66
- data/web/locales/nb.yml +61 -61
- data/web/locales/nl.yml +52 -52
- data/web/locales/pl.yml +45 -45
- data/web/locales/pt-br.yml +63 -55
- data/web/locales/pt.yml +51 -51
- data/web/locales/ru.yml +67 -66
- data/web/locales/sv.yml +53 -53
- data/web/locales/ta.yml +60 -60
- data/web/locales/uk.yml +62 -61
- data/web/locales/ur.yml +64 -64
- data/web/locales/vi.yml +67 -67
- data/web/locales/zh-cn.yml +43 -16
- data/web/locales/zh-tw.yml +42 -8
- data/web/views/_footer.erb +5 -2
- data/web/views/_job_info.erb +18 -2
- data/web/views/_metrics_period_select.erb +12 -0
- data/web/views/_nav.erb +1 -1
- data/web/views/_paging.erb +2 -0
- data/web/views/_poll_link.erb +1 -1
- data/web/views/_summary.erb +1 -1
- data/web/views/busy.erb +42 -26
- data/web/views/dashboard.erb +36 -4
- data/web/views/metrics.erb +82 -0
- data/web/views/metrics_for_job.erb +71 -0
- data/web/views/morgue.erb +5 -9
- data/web/views/queue.erb +15 -15
- data/web/views/queues.erb +3 -1
- data/web/views/retries.erb +5 -9
- data/web/views/scheduled.erb +12 -13
- metadata +63 -28
- data/lib/sidekiq/delay.rb +0 -43
- data/lib/sidekiq/exception_handler.rb +0 -27
- data/lib/sidekiq/extensions/action_mailer.rb +0 -48
- data/lib/sidekiq/extensions/active_record.rb +0 -43
- data/lib/sidekiq/extensions/class_methods.rb +0 -43
- data/lib/sidekiq/extensions/generic_proxy.rb +0 -33
- data/lib/sidekiq/util.rb +0 -108
- data/lib/sidekiq/worker.rb +0 -362
- /data/{LICENSE → LICENSE.txt} +0 -0
@@ -9,7 +9,9 @@ var ready = (callback) => {
|
|
9
9
|
else document.addEventListener("DOMContentLoaded", callback);
|
10
10
|
}
|
11
11
|
|
12
|
-
ready(
|
12
|
+
ready(addListeners)
|
13
|
+
|
14
|
+
function addListeners() {
|
13
15
|
document.querySelectorAll(".check_all").forEach(node => {
|
14
16
|
node.addEventListener("click", event => {
|
15
17
|
node.closest('table').querySelectorAll('input[type=checkbox]').forEach(inp => { inp.checked = !!node.checked; });
|
@@ -26,42 +28,66 @@ ready(() => {
|
|
26
28
|
})
|
27
29
|
|
28
30
|
document.querySelectorAll("[data-toggle]").forEach(node => {
|
29
|
-
node.addEventListener("click",
|
30
|
-
var targName = node.getAttribute("data-toggle");
|
31
|
-
var full = document.getElementById(targName + "_full");
|
32
|
-
if (full.style.display == "block") {
|
33
|
-
full.style.display = 'none';
|
34
|
-
} else {
|
35
|
-
full.style.display = 'block';
|
36
|
-
}
|
37
|
-
})
|
31
|
+
node.addEventListener("click", addDataToggleListeners)
|
38
32
|
})
|
39
33
|
|
34
|
+
addShiftClickListeners()
|
40
35
|
updateFuzzyTimes();
|
36
|
+
setLivePollFromUrl();
|
41
37
|
|
42
38
|
var buttons = document.querySelectorAll(".live-poll");
|
43
39
|
if (buttons.length > 0) {
|
44
40
|
buttons.forEach(node => {
|
45
|
-
node.addEventListener("click",
|
46
|
-
if (localStorage.sidekiqLivePoll == "enabled") {
|
47
|
-
localStorage.sidekiqLivePoll = "disabled";
|
48
|
-
clearTimeout(livePollTimer);
|
49
|
-
livePollTimer = null;
|
50
|
-
} else {
|
51
|
-
localStorage.sidekiqLivePoll = "enabled";
|
52
|
-
livePollCallback();
|
53
|
-
}
|
54
|
-
|
55
|
-
updateLivePollButton();
|
56
|
-
})
|
41
|
+
node.addEventListener("click", addPollingListeners)
|
57
42
|
});
|
58
43
|
|
59
44
|
updateLivePollButton();
|
60
|
-
if (localStorage.sidekiqLivePoll == "enabled") {
|
45
|
+
if (localStorage.sidekiqLivePoll == "enabled" && !livePollTimer) {
|
61
46
|
scheduleLivePoll();
|
62
47
|
}
|
63
48
|
}
|
64
|
-
}
|
49
|
+
}
|
50
|
+
|
51
|
+
function addPollingListeners(_event) {
|
52
|
+
if (localStorage.sidekiqLivePoll == "enabled") {
|
53
|
+
localStorage.sidekiqLivePoll = "disabled";
|
54
|
+
clearTimeout(livePollTimer);
|
55
|
+
livePollTimer = null;
|
56
|
+
} else {
|
57
|
+
localStorage.sidekiqLivePoll = "enabled";
|
58
|
+
livePollCallback();
|
59
|
+
}
|
60
|
+
|
61
|
+
updateLivePollButton();
|
62
|
+
}
|
63
|
+
|
64
|
+
function addDataToggleListeners(event) {
|
65
|
+
var source = event.target || event.srcElement;
|
66
|
+
var targName = source.getAttribute("data-toggle");
|
67
|
+
var full = document.getElementById(targName);
|
68
|
+
if (full.style.display == "block") {
|
69
|
+
full.style.display = 'none';
|
70
|
+
} else {
|
71
|
+
full.style.display = 'block';
|
72
|
+
}
|
73
|
+
}
|
74
|
+
|
75
|
+
function addShiftClickListeners() {
|
76
|
+
let checkboxes = Array.from(document.querySelectorAll(".shift_clickable"));
|
77
|
+
let lastChecked = null;
|
78
|
+
checkboxes.forEach(checkbox => {
|
79
|
+
checkbox.addEventListener("click", (e) => {
|
80
|
+
if (e.shiftKey && lastChecked) {
|
81
|
+
let myIndex = checkboxes.indexOf(checkbox);
|
82
|
+
let lastIndex = checkboxes.indexOf(lastChecked);
|
83
|
+
let [min, max] = [myIndex, lastIndex].sort();
|
84
|
+
let newState = checkbox.checked;
|
85
|
+
checkboxes.slice(min, max).forEach(c => c.checked = newState);
|
86
|
+
}
|
87
|
+
lastChecked = checkbox;
|
88
|
+
});
|
89
|
+
});
|
90
|
+
}
|
65
91
|
|
66
92
|
function updateFuzzyTimes() {
|
67
93
|
var locale = document.body.getAttribute("data-locale");
|
@@ -76,6 +102,14 @@ function updateFuzzyTimes() {
|
|
76
102
|
t.cancel();
|
77
103
|
}
|
78
104
|
|
105
|
+
function setLivePollFromUrl() {
|
106
|
+
var url_params = new URL(window.location.href).searchParams
|
107
|
+
|
108
|
+
if (url_params.get("poll") == "true") {
|
109
|
+
localStorage.sidekiqLivePoll = "enabled";
|
110
|
+
}
|
111
|
+
}
|
112
|
+
|
79
113
|
function updateLivePollButton() {
|
80
114
|
if (localStorage.sidekiqLivePoll == "enabled") {
|
81
115
|
document.querySelectorAll('.live-poll-stop').forEach(box => { box.style.display = "inline-block" })
|
@@ -89,7 +123,19 @@ function updateLivePollButton() {
|
|
89
123
|
function livePollCallback() {
|
90
124
|
clearTimeout(livePollTimer);
|
91
125
|
|
92
|
-
fetch(window.location.href)
|
126
|
+
fetch(window.location.href)
|
127
|
+
.then(checkResponse)
|
128
|
+
.then(resp => resp.text())
|
129
|
+
.then(replacePage)
|
130
|
+
.catch(showError)
|
131
|
+
.finally(scheduleLivePoll)
|
132
|
+
}
|
133
|
+
|
134
|
+
function checkResponse(resp) {
|
135
|
+
if (!resp.ok) {
|
136
|
+
throw response.error();
|
137
|
+
}
|
138
|
+
return resp
|
93
139
|
}
|
94
140
|
|
95
141
|
function scheduleLivePoll() {
|
@@ -107,5 +153,9 @@ function replacePage(text) {
|
|
107
153
|
var header_status = doc.querySelector('.status')
|
108
154
|
document.querySelector('.status').replaceWith(header_status)
|
109
155
|
|
110
|
-
|
156
|
+
addListeners();
|
157
|
+
}
|
158
|
+
|
159
|
+
function showError(error) {
|
160
|
+
console.error(error)
|
111
161
|
}
|
@@ -0,0 +1,106 @@
|
|
1
|
+
if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
|
2
|
+
Chart.defaults.borderColor = "#333";
|
3
|
+
Chart.defaults.color = "#aaa";
|
4
|
+
}
|
5
|
+
|
6
|
+
class Colors {
|
7
|
+
constructor() {
|
8
|
+
this.assignments = {};
|
9
|
+
this.success = "#006f68";
|
10
|
+
this.failure = "#af0014";
|
11
|
+
this.fallback = "#999";
|
12
|
+
this.primary = "#537bc4";
|
13
|
+
this.available = [
|
14
|
+
// Colors taken from https://www.chartjs.org/docs/latest/samples/utils.html
|
15
|
+
"#537bc4",
|
16
|
+
"#4dc9f6",
|
17
|
+
"#f67019",
|
18
|
+
"#f53794",
|
19
|
+
"#acc236",
|
20
|
+
"#166a8f",
|
21
|
+
"#00a950",
|
22
|
+
"#58595b",
|
23
|
+
"#8549ba",
|
24
|
+
"#991b1b",
|
25
|
+
];
|
26
|
+
}
|
27
|
+
|
28
|
+
checkOut(assignee) {
|
29
|
+
const color =
|
30
|
+
this.assignments[assignee] || this.available.shift() || this.fallback;
|
31
|
+
this.assignments[assignee] = color;
|
32
|
+
return color;
|
33
|
+
}
|
34
|
+
|
35
|
+
checkIn(assignee) {
|
36
|
+
const color = this.assignments[assignee];
|
37
|
+
delete this.assignments[assignee];
|
38
|
+
|
39
|
+
if (color && color != this.fallback) {
|
40
|
+
this.available.unshift(color);
|
41
|
+
}
|
42
|
+
}
|
43
|
+
}
|
44
|
+
|
45
|
+
class BaseChart {
|
46
|
+
constructor(el, options) {
|
47
|
+
this.el = el;
|
48
|
+
this.options = options;
|
49
|
+
this.colors = new Colors();
|
50
|
+
}
|
51
|
+
|
52
|
+
init() {
|
53
|
+
this.chart = new Chart(this.el, {
|
54
|
+
type: this.options.chartType,
|
55
|
+
data: { labels: this.options.labels, datasets: this.datasets },
|
56
|
+
options: this.chartOptions,
|
57
|
+
});
|
58
|
+
}
|
59
|
+
|
60
|
+
update() {
|
61
|
+
this.chart.options = this.chartOptions;
|
62
|
+
this.chart.update();
|
63
|
+
}
|
64
|
+
|
65
|
+
get chartOptions() {
|
66
|
+
let chartOptions = {
|
67
|
+
interaction: {
|
68
|
+
mode: "nearest",
|
69
|
+
axis: "x",
|
70
|
+
intersect: false,
|
71
|
+
},
|
72
|
+
scales: {
|
73
|
+
x: {
|
74
|
+
ticks: {
|
75
|
+
autoSkipPadding: 10,
|
76
|
+
},
|
77
|
+
},
|
78
|
+
},
|
79
|
+
plugins: {
|
80
|
+
legend: {
|
81
|
+
display: false,
|
82
|
+
},
|
83
|
+
annotation: {
|
84
|
+
annotations: {},
|
85
|
+
},
|
86
|
+
tooltip: {
|
87
|
+
animation: false,
|
88
|
+
},
|
89
|
+
},
|
90
|
+
};
|
91
|
+
|
92
|
+
if (this.options.marks) {
|
93
|
+
this.options.marks.forEach(([bucket, label], i) => {
|
94
|
+
chartOptions.plugins.annotation.annotations[`deploy-${i}`] = {
|
95
|
+
type: "line",
|
96
|
+
xMin: bucket,
|
97
|
+
xMax: bucket,
|
98
|
+
borderColor: "rgba(220, 38, 38, 0.4)",
|
99
|
+
borderWidth: 2,
|
100
|
+
};
|
101
|
+
});
|
102
|
+
}
|
103
|
+
|
104
|
+
return chartOptions;
|
105
|
+
}
|
106
|
+
}
|