sidekiq 5.2.7 → 7.0.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.

Files changed (146) hide show
  1. checksums.yaml +4 -4
  2. data/Changes.md +465 -5
  3. data/LICENSE.txt +9 -0
  4. data/README.md +32 -42
  5. data/bin/sidekiq +22 -3
  6. data/bin/sidekiqload +80 -77
  7. data/bin/sidekiqmon +8 -0
  8. data/lib/generators/sidekiq/job_generator.rb +57 -0
  9. data/lib/generators/sidekiq/templates/{worker.rb.erb → job.rb.erb} +2 -2
  10. data/lib/generators/sidekiq/templates/{worker_spec.rb.erb → job_spec.rb.erb} +1 -1
  11. data/lib/generators/sidekiq/templates/{worker_test.rb.erb → job_test.rb.erb} +1 -1
  12. data/lib/sidekiq/api.rb +506 -351
  13. data/lib/sidekiq/capsule.rb +110 -0
  14. data/lib/sidekiq/cli.rb +202 -226
  15. data/lib/sidekiq/client.rb +104 -95
  16. data/lib/sidekiq/component.rb +66 -0
  17. data/lib/sidekiq/config.rb +270 -0
  18. data/lib/sidekiq/deploy.rb +62 -0
  19. data/lib/sidekiq/embedded.rb +61 -0
  20. data/lib/sidekiq/fetch.rb +49 -40
  21. data/lib/sidekiq/job.rb +378 -0
  22. data/lib/sidekiq/job_logger.rb +33 -7
  23. data/lib/sidekiq/job_retry.rb +127 -107
  24. data/lib/sidekiq/job_util.rb +71 -0
  25. data/lib/sidekiq/launcher.rb +197 -103
  26. data/lib/sidekiq/logger.rb +131 -0
  27. data/lib/sidekiq/manager.rb +43 -46
  28. data/lib/sidekiq/metrics/query.rb +153 -0
  29. data/lib/sidekiq/metrics/shared.rb +95 -0
  30. data/lib/sidekiq/metrics/tracking.rb +134 -0
  31. data/lib/sidekiq/middleware/chain.rb +104 -50
  32. data/lib/sidekiq/middleware/current_attributes.rb +58 -0
  33. data/lib/sidekiq/middleware/i18n.rb +7 -7
  34. data/lib/sidekiq/middleware/modules.rb +21 -0
  35. data/lib/sidekiq/monitor.rb +148 -0
  36. data/lib/sidekiq/paginator.rb +28 -16
  37. data/lib/sidekiq/processor.rb +105 -107
  38. data/lib/sidekiq/rails.rb +41 -37
  39. data/lib/sidekiq/redis_client_adapter.rb +115 -0
  40. data/lib/sidekiq/redis_connection.rb +38 -107
  41. data/lib/sidekiq/ring_buffer.rb +29 -0
  42. data/lib/sidekiq/scheduled.rb +111 -49
  43. data/lib/sidekiq/sd_notify.rb +149 -0
  44. data/lib/sidekiq/systemd.rb +24 -0
  45. data/lib/sidekiq/testing/inline.rb +6 -5
  46. data/lib/sidekiq/testing.rb +66 -84
  47. data/lib/sidekiq/transaction_aware_client.rb +44 -0
  48. data/lib/sidekiq/version.rb +3 -1
  49. data/lib/sidekiq/web/action.rb +15 -11
  50. data/lib/sidekiq/web/application.rb +108 -79
  51. data/lib/sidekiq/web/csrf_protection.rb +180 -0
  52. data/lib/sidekiq/web/helpers.rb +128 -105
  53. data/lib/sidekiq/web/router.rb +23 -19
  54. data/lib/sidekiq/web.rb +56 -107
  55. data/lib/sidekiq/worker_compatibility_alias.rb +13 -0
  56. data/lib/sidekiq.rb +92 -182
  57. data/sidekiq.gemspec +45 -16
  58. data/web/assets/images/apple-touch-icon.png +0 -0
  59. data/web/assets/javascripts/application.js +130 -61
  60. data/web/assets/javascripts/base-charts.js +106 -0
  61. data/web/assets/javascripts/chart.min.js +13 -0
  62. data/web/assets/javascripts/chartjs-plugin-annotation.min.js +7 -0
  63. data/web/assets/javascripts/dashboard-charts.js +166 -0
  64. data/web/assets/javascripts/dashboard.js +36 -292
  65. data/web/assets/javascripts/metrics.js +236 -0
  66. data/web/assets/stylesheets/application-dark.css +147 -0
  67. data/web/assets/stylesheets/application-rtl.css +2 -95
  68. data/web/assets/stylesheets/application.css +102 -522
  69. data/web/locales/ar.yml +71 -65
  70. data/web/locales/cs.yml +62 -62
  71. data/web/locales/da.yml +52 -52
  72. data/web/locales/de.yml +65 -53
  73. data/web/locales/el.yml +43 -24
  74. data/web/locales/en.yml +84 -66
  75. data/web/locales/es.yml +70 -54
  76. data/web/locales/fa.yml +65 -65
  77. data/web/locales/fr.yml +69 -62
  78. data/web/locales/he.yml +65 -64
  79. data/web/locales/hi.yml +59 -59
  80. data/web/locales/it.yml +53 -53
  81. data/web/locales/ja.yml +73 -64
  82. data/web/locales/ko.yml +52 -52
  83. data/web/locales/lt.yml +83 -0
  84. data/web/locales/nb.yml +61 -61
  85. data/web/locales/nl.yml +52 -52
  86. data/web/locales/pl.yml +45 -45
  87. data/web/locales/pt-br.yml +63 -55
  88. data/web/locales/pt.yml +51 -51
  89. data/web/locales/ru.yml +68 -63
  90. data/web/locales/sv.yml +53 -53
  91. data/web/locales/ta.yml +60 -60
  92. data/web/locales/uk.yml +62 -61
  93. data/web/locales/ur.yml +64 -64
  94. data/web/locales/vi.yml +83 -0
  95. data/web/locales/zh-cn.yml +43 -16
  96. data/web/locales/zh-tw.yml +42 -8
  97. data/web/views/_footer.erb +6 -3
  98. data/web/views/_job_info.erb +19 -2
  99. data/web/views/_nav.erb +1 -1
  100. data/web/views/_poll_link.erb +3 -6
  101. data/web/views/_summary.erb +7 -7
  102. data/web/views/busy.erb +74 -22
  103. data/web/views/dashboard.erb +58 -18
  104. data/web/views/dead.erb +3 -3
  105. data/web/views/layout.erb +3 -1
  106. data/web/views/metrics.erb +80 -0
  107. data/web/views/metrics_for_job.erb +69 -0
  108. data/web/views/morgue.erb +10 -7
  109. data/web/views/queue.erb +23 -10
  110. data/web/views/queues.erb +10 -2
  111. data/web/views/retries.erb +12 -9
  112. data/web/views/retry.erb +3 -3
  113. data/web/views/scheduled.erb +6 -3
  114. metadata +84 -69
  115. data/.circleci/config.yml +0 -61
  116. data/.github/contributing.md +0 -32
  117. data/.github/issue_template.md +0 -11
  118. data/.gitignore +0 -15
  119. data/.travis.yml +0 -11
  120. data/3.0-Upgrade.md +0 -70
  121. data/4.0-Upgrade.md +0 -53
  122. data/5.0-Upgrade.md +0 -56
  123. data/COMM-LICENSE +0 -97
  124. data/Ent-Changes.md +0 -238
  125. data/Gemfile +0 -23
  126. data/LICENSE +0 -9
  127. data/Pro-2.0-Upgrade.md +0 -138
  128. data/Pro-3.0-Upgrade.md +0 -44
  129. data/Pro-4.0-Upgrade.md +0 -35
  130. data/Pro-Changes.md +0 -759
  131. data/Rakefile +0 -9
  132. data/bin/sidekiqctl +0 -20
  133. data/code_of_conduct.md +0 -50
  134. data/lib/generators/sidekiq/worker_generator.rb +0 -49
  135. data/lib/sidekiq/core_ext.rb +0 -1
  136. data/lib/sidekiq/ctl.rb +0 -221
  137. data/lib/sidekiq/delay.rb +0 -42
  138. data/lib/sidekiq/exception_handler.rb +0 -29
  139. data/lib/sidekiq/extensions/action_mailer.rb +0 -57
  140. data/lib/sidekiq/extensions/active_record.rb +0 -40
  141. data/lib/sidekiq/extensions/class_methods.rb +0 -40
  142. data/lib/sidekiq/extensions/generic_proxy.rb +0 -31
  143. data/lib/sidekiq/logging.rb +0 -122
  144. data/lib/sidekiq/middleware/server/active_record.rb +0 -23
  145. data/lib/sidekiq/util.rb +0 -66
  146. data/lib/sidekiq/worker.rb +0 -220
@@ -0,0 +1,236 @@
1
+ class JobMetricsOverviewChart extends BaseChart {
2
+ constructor(el, options) {
3
+ super(el, { ...options, chartType: "line" });
4
+ this.swatches = [];
5
+ this.visibleKls = options.visibleKls;
6
+
7
+ this.init();
8
+ }
9
+
10
+ get datasets() {
11
+ return Object.entries(this.options.series)
12
+ .filter(([kls, _]) => this.visibleKls.includes(kls))
13
+ .map(([kls, _]) => this.buildDataset(kls));
14
+ }
15
+
16
+ get metric() {
17
+ return this._metric || this.options.initialMetric;
18
+ }
19
+
20
+ set metric(m) {
21
+ this._metric = m;
22
+ }
23
+
24
+ registerSwatch(id) {
25
+ const el = document.getElementById(id);
26
+ el.addEventListener("change", () => this.toggleKls(el.value, el.checked));
27
+ this.swatches[el.value] = el;
28
+ this.updateSwatch(el.value, el.checked);
29
+ }
30
+
31
+ updateSwatch(kls, checked) {
32
+ const el = this.swatches[kls];
33
+ el.checked = checked;
34
+ el.style.color = this.colors.assignments[kls] || "";
35
+ }
36
+
37
+ toggleKls(kls, visible) {
38
+ if (visible) {
39
+ this.chart.data.datasets.push(this.buildDataset(kls));
40
+ } else {
41
+ const i = this.chart.data.datasets.findIndex((ds) => ds.label == kls);
42
+ this.colors.checkIn(kls);
43
+ this.chart.data.datasets.splice(i, 1);
44
+ }
45
+
46
+ this.updateSwatch(kls, visible);
47
+ this.update();
48
+ }
49
+
50
+ buildDataset(kls) {
51
+ const color = this.colors.checkOut(kls);
52
+
53
+ return {
54
+ label: kls,
55
+ data: this.options.series[kls],
56
+ borderColor: color,
57
+ backgroundColor: color,
58
+ borderWidth: 2,
59
+ pointRadius: 2,
60
+ };
61
+ }
62
+
63
+ get chartOptions() {
64
+ return {
65
+ ...super.chartOptions,
66
+ aspectRatio: 4,
67
+ scales: {
68
+ ...super.chartOptions.scales,
69
+ y: {
70
+ ...super.chartOptions.scales.y,
71
+ beginAtZero: true,
72
+ title: {
73
+ text: this.options.yLabel,
74
+ display: true,
75
+ },
76
+ },
77
+ },
78
+ plugins: {
79
+ ...super.chartOptions.plugins,
80
+ tooltip: {
81
+ ...super.chartOptions.plugins.tooltip,
82
+ callbacks: {
83
+ title: (items) => `${items[0].label} UTC`,
84
+ label: (item) =>
85
+ `${item.dataset.label}: ${item.parsed.y.toFixed(1)} ` +
86
+ `${this.options.units}`,
87
+ footer: (items) => {
88
+ const bucket = items[0].label;
89
+ const marks = this.options.marks.filter(([b, _]) => b == bucket);
90
+ return marks.map(
91
+ ([b, msg]) => `${this.options.markLabel}: ${msg}`
92
+ );
93
+ },
94
+ },
95
+ },
96
+ },
97
+ };
98
+ }
99
+ }
100
+
101
+ class HistTotalsChart extends BaseChart {
102
+ constructor(el, options) {
103
+ super(el, { ...options, chartType: "bar" });
104
+ this.init();
105
+ }
106
+
107
+ get datasets() {
108
+ return [
109
+ {
110
+ data: this.options.series,
111
+ backgroundColor: this.colors.primary,
112
+ borderWidth: 0,
113
+ },
114
+ ];
115
+ }
116
+
117
+ get chartOptions() {
118
+ return {
119
+ ...super.chartOptions,
120
+ aspectRatio: 6,
121
+ scales: {
122
+ ...super.chartOptions.scales,
123
+ y: {
124
+ ...super.chartOptions.scales.y,
125
+ beginAtZero: true,
126
+ title: {
127
+ text: this.options.yLabel,
128
+ display: true,
129
+ },
130
+ },
131
+ x: {
132
+ ...super.chartOptions.scales.x,
133
+ title: {
134
+ text: this.options.xLabel,
135
+ display: true,
136
+ },
137
+ },
138
+ },
139
+ plugins: {
140
+ ...super.chartOptions.plugins,
141
+ tooltip: {
142
+ ...super.chartOptions.plugins.tooltip,
143
+ callbacks: {
144
+ label: (item) => `${item.parsed.y} ${this.options.units}`,
145
+ },
146
+ },
147
+ },
148
+ };
149
+ }
150
+ }
151
+
152
+ class HistBubbleChart extends BaseChart {
153
+ constructor(el, options) {
154
+ super(el, { ...options, chartType: "bubble" });
155
+ this.init();
156
+ }
157
+
158
+ get datasets() {
159
+ const data = [];
160
+ let maxCount = 0;
161
+
162
+ Object.entries(this.options.hist).forEach(([bucket, hist]) => {
163
+ hist.forEach((count, histBucket) => {
164
+ if (count > 0) {
165
+ // histogram data is ordered fastest to slowest, but this.histIntervals is
166
+ // slowest to fastest (so it displays correctly on the chart).
167
+ const index = this.options.histIntervals.length - 1 - histBucket;
168
+
169
+ data.push({
170
+ x: bucket,
171
+ y: this.options.histIntervals[index] / 1000,
172
+ count: count,
173
+ });
174
+
175
+ if (count > maxCount) maxCount = count;
176
+ }
177
+ });
178
+ });
179
+
180
+ // Chart.js will not calculate the bubble size. We have to do that.
181
+ const maxRadius = this.el.offsetWidth / this.options.labels.length;
182
+ const minRadius = 1;
183
+ const multiplier = (maxRadius / maxCount) * 1.5;
184
+ data.forEach((entry) => {
185
+ entry.r = entry.count * multiplier + minRadius;
186
+ });
187
+
188
+ return [
189
+ {
190
+ data: data,
191
+ backgroundColor: this.colors.primary,
192
+ borderColor: this.colors.primary,
193
+ },
194
+ ];
195
+ }
196
+
197
+ get chartOptions() {
198
+ return {
199
+ ...super.chartOptions,
200
+ aspectRatio: 3,
201
+ scales: {
202
+ ...super.chartOptions.scales,
203
+ x: {
204
+ ...super.chartOptions.scales.x,
205
+ type: "category",
206
+ labels: this.options.labels,
207
+ },
208
+ y: {
209
+ ...super.chartOptions.scales.y,
210
+ title: {
211
+ text: this.options.yLabel,
212
+ display: true,
213
+ },
214
+ },
215
+ },
216
+ plugins: {
217
+ ...super.chartOptions.plugins,
218
+ tooltip: {
219
+ ...super.chartOptions.plugins.tooltip,
220
+ callbacks: {
221
+ title: (items) => `${items[0].raw.x} UTC`,
222
+ label: (item) =>
223
+ `${item.parsed.y} ${this.options.yUnits}: ${item.raw.count} ${this.options.zUnits}`,
224
+ footer: (items) => {
225
+ const bucket = items[0].raw.x;
226
+ const marks = this.options.marks.filter(([b, _]) => b == bucket);
227
+ return marks.map(
228
+ ([b, msg]) => `${this.options.markLabel}: ${msg}`
229
+ );
230
+ },
231
+ },
232
+ },
233
+ },
234
+ };
235
+ }
236
+ }
@@ -0,0 +1,147 @@
1
+ html, body {
2
+ background-color: #171717 !important;
3
+ color: #DEDEDE;
4
+ }
5
+
6
+ a,
7
+ .title,
8
+ .summary_bar ul .count,
9
+ span.current-interval,
10
+ .navbar .navbar-brand {
11
+ color: #d04;
12
+ }
13
+
14
+ .history-graph.active,
15
+ .beacon .dot {
16
+ background-color: #d04;
17
+ }
18
+
19
+ .navbar .navbar-brand:hover {
20
+ color: #ddd;
21
+ }
22
+
23
+ .navbar .navbar-brand .status {
24
+ color: #ddd;
25
+ }
26
+
27
+ .navbar-default .navbar-nav > li > a {
28
+ color: #ddd;
29
+ }
30
+
31
+ .navbar-inverse {
32
+ background-color: #222;
33
+ border-color: #444;
34
+ }
35
+
36
+ table {
37
+ background-color: #1D1D1D;
38
+ }
39
+
40
+ .table-striped > tbody > tr:nth-of-type(odd) {
41
+ background-color: #2E2E2E;
42
+ }
43
+
44
+ .table-bordered,
45
+ .table-bordered > tbody > tr > td,
46
+ .table-bordered > tbody > tr > th,
47
+ .table-bordered > tfoot > tr > td,
48
+ .table-bordered > tfoot > tr > th,
49
+ .table-bordered > thead > tr > td,
50
+ .table-bordered > thead > tr > th {
51
+ border: 1px solid #444;
52
+ }
53
+
54
+ .table-hover > tbody > tr:hover {
55
+ background-color: #444;
56
+ }
57
+
58
+ .alert {
59
+ border: none;
60
+ color: #ddd;
61
+ }
62
+
63
+ .alert-success {
64
+ background-color: #484;
65
+ }
66
+
67
+ .alert-danger {
68
+ background-color: #980035;
69
+ }
70
+
71
+ .alert-info {
72
+ background-color: #31708f;
73
+ }
74
+
75
+ .alert-warning {
76
+ background-color: #c47612;
77
+ }
78
+
79
+ a:link, a:active, a:hover, a:visited {
80
+ color: #ddd;
81
+ }
82
+
83
+ input {
84
+ background-color: #444;
85
+ color: #ccc;
86
+ padding: 3px;
87
+ }
88
+
89
+ .summary_bar .summary {
90
+ background-color: #232323;
91
+ border: 1px solid #444;
92
+ }
93
+
94
+ .navbar-default {
95
+ background-color: #0F0F0F;
96
+ border-color: #444;
97
+ }
98
+
99
+ .navbar-default .navbar-nav > .active > a,
100
+ .navbar-default .navbar-nav > .active > a:focus,
101
+ .navbar-default .navbar-nav > .active > a:hover {
102
+ color: #ddd;
103
+ background-color: #333;
104
+ }
105
+
106
+ .navbar-default .navbar-nav > li > a:hover {
107
+ color: #ddd;
108
+ }
109
+
110
+ .pagination > li > a,
111
+ .pagination > li > a:hover,
112
+ .pagination > li > span {
113
+ color: #ddd;
114
+ background-color: #333;
115
+ border-color: #444;
116
+ }
117
+ .pagination > .disabled > a,
118
+ .pagination > .disabled > a:focus,
119
+ .pagination > .disabled > a:hover,
120
+ .pagination > .disabled > span,
121
+ .pagination > .disabled > span:focus,
122
+ .pagination > .disabled > span:hover {
123
+ color: #ddd;
124
+ background-color: #333;
125
+ border-color: #444;
126
+ }
127
+
128
+ .stat {
129
+ border: 1px solid #888;
130
+ }
131
+
132
+ .rickshaw_graph .detail {
133
+ background: #888;
134
+ }
135
+ .rickshaw_graph .x_tick {
136
+ border-color: #888;
137
+ }
138
+
139
+ .rickshaw_graph .y_ticks.glow text {
140
+ fill: #ddd;
141
+ color: #ddd;
142
+ }
143
+
144
+ .info-circle {
145
+ color: #222;
146
+ background-color: #888;
147
+ }
@@ -46,10 +46,6 @@ form .btn-group .btn {
46
46
  .navbar .poll-wrapper {
47
47
  margin: 4px 0 0 4px;
48
48
  }
49
-
50
- .navbar .dropdown-menu a {
51
- text-align: right;
52
- }
53
49
  }
54
50
 
55
51
  .navbar-footer .navbar ul.nav a.navbar-brand {
@@ -106,22 +102,8 @@ div.interval-slider {
106
102
  float: left;
107
103
  }
108
104
 
109
- #realtime-legend,
110
- #history-legend {
111
- text-align: right;
112
- float: left;
113
- }
114
- #realtime-legend .timestamp,
115
- #history-legend .timestamp {
116
- text-align: left;
117
- }
118
- #realtime-legend .line,
119
- #history-legend .line {
120
- margin: 0 20px 0 0;
121
- }
122
- #realtime-legend .swatch,
123
- #history-legend .swatch {
124
- margin: 0 0 0 8px;
105
+ #realtime-legend {
106
+ justify-content: start;
125
107
  }
126
108
 
127
109
  /* Beacon
@@ -169,78 +151,3 @@ div.interval-slider {
169
151
  padding-left: 5px;
170
152
  }
171
153
  }
172
-
173
- /* Rickshaw */
174
-
175
- .rickshaw_graph .detail .x_label.left {
176
- right: 0
177
- }
178
- .rickshaw_graph .detail .x_label.right {
179
- left: 0
180
- }
181
- .rickshaw_graph .detail .item.left {
182
- right: 0
183
- }
184
- .rickshaw_graph .detail .item.right {
185
- left: 0
186
- }
187
- .rickshaw_graph .detail .item.left:after {
188
- left: 0;
189
- right: -5px;
190
- border-right-color: unset;
191
- border-left-color: rgba(0, 0, 0, .8);
192
- border-right-width: 0;
193
- border-left-width: unset;
194
- }
195
- .rickshaw_graph .detail .item.right:after {
196
- right: 0;
197
- left: -5px;
198
- border-left-color: unset;
199
- border-right-color: rgba(0, 0, 0, .8);
200
- border-left-width: 0;
201
- border-right-width: unset;
202
- }
203
- .rickshaw_graph .detail .dot {
204
- margin-right: -3px;
205
- margin-left: unset;
206
- }
207
- .rickshaw_graph .x_tick {
208
- border-left: unset;
209
- border-right: 1px dotted rgba(0, 0, 0, .2);
210
- }
211
- .rickshaw_graph .x_tick .title {
212
- margin-right: 3px;
213
- margin-left: unset;
214
- }
215
- .rickshaw_annotation_timeline .annotation {
216
- margin-right: -2px;
217
- margin-left: unset;
218
- }
219
- .rickshaw_graph .annotation_line {
220
- border-right: 2px solid rgba(0, 0, 0, .3);
221
- border-left: unset;
222
- }
223
- .rickshaw_annotation_timeline .annotation .content {
224
- left: unset;
225
- right: -11px;
226
- }
227
- .rickshaw_graph .x_tick.glow .title,
228
- .rickshaw_graph .y_ticks.glow text {
229
- text-shadow: 1px 1px 0 rgba(255, 255, 255, .1), -1px -1px 0 rgba(255, 255, 255, .1), -1px 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1), 0 -1px 0 rgba(255, 255, 255, .1), -1px 0 0 rgba(255, 255, 255, .1), 1px 0 0 rgba(255, 255, 255, .1), 1px -1px 0 rgba(255, 255, 255, .1)
230
- }
231
- .rickshaw_graph .x_tick.inverse .title,
232
- .rickshaw_graph .y_ticks.inverse text {
233
- text-shadow: 1px 1px 0 rgba(0, 0, 0, .8), -1px -1px 0 rgba(0, 0, 0, .8), -1px 1px 0 rgba(0, 0, 0, .8), 0 1px 0 rgba(0, 0, 0, .8), 0 -1px 0 rgba(0, 0, 0, .8), -1px 0 0 rgba(0, 0, 0, .8), 1px 0 0 rgba(0, 0, 0, .8), 1px -1px 0 rgba(0, 0, 0, .8)
234
- }
235
- .rickshaw_legend .line {
236
- padding-left: 15px;
237
- padding-right: unset;
238
- }
239
- .rickshaw_legend .line .swatch {
240
- margin-left: 3px;
241
- margin-right: unset;
242
- }
243
- .rickshaw_legend .action {
244
- margin-left: .2em;
245
- margin-right: unset;
246
- }