sidekiq 6.5.7 → 7.1.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Changes.md +154 -13
- data/README.md +40 -32
- data/bin/sidekiq +3 -8
- data/bin/sidekiqload +204 -118
- data/bin/sidekiqmon +3 -0
- data/lib/sidekiq/api.rb +124 -131
- data/lib/sidekiq/capsule.rb +127 -0
- data/lib/sidekiq/cli.rb +57 -63
- data/lib/sidekiq/client.rb +64 -37
- data/lib/sidekiq/component.rb +4 -1
- data/lib/sidekiq/config.rb +278 -0
- data/lib/sidekiq/deploy.rb +62 -0
- data/lib/sidekiq/embedded.rb +61 -0
- data/lib/sidekiq/fetch.rb +11 -14
- data/lib/sidekiq/job.rb +371 -10
- data/lib/sidekiq/job_logger.rb +2 -2
- data/lib/sidekiq/job_retry.rb +33 -15
- data/lib/sidekiq/job_util.rb +51 -15
- data/lib/sidekiq/launcher.rb +66 -62
- data/lib/sidekiq/logger.rb +1 -26
- data/lib/sidekiq/manager.rb +9 -11
- data/lib/sidekiq/metrics/query.rb +4 -4
- data/lib/sidekiq/metrics/shared.rb +8 -7
- data/lib/sidekiq/metrics/tracking.rb +20 -18
- data/lib/sidekiq/middleware/chain.rb +19 -18
- data/lib/sidekiq/middleware/current_attributes.rb +53 -21
- data/lib/sidekiq/monitor.rb +17 -4
- data/lib/sidekiq/paginator.rb +10 -2
- data/lib/sidekiq/processor.rb +46 -51
- data/lib/sidekiq/rails.rb +12 -7
- data/lib/sidekiq/redis_client_adapter.rb +11 -69
- data/lib/sidekiq/redis_connection.rb +11 -111
- data/lib/sidekiq/scheduled.rb +21 -22
- data/lib/sidekiq/testing.rb +5 -33
- data/lib/sidekiq/transaction_aware_client.rb +4 -5
- data/lib/sidekiq/version.rb +2 -1
- data/lib/sidekiq/web/action.rb +3 -3
- data/lib/sidekiq/web/application.rb +29 -11
- data/lib/sidekiq/web/csrf_protection.rb +2 -2
- data/lib/sidekiq/web/helpers.rb +23 -32
- data/lib/sidekiq/web.rb +17 -16
- data/lib/sidekiq/worker_compatibility_alias.rb +13 -0
- data/lib/sidekiq.rb +76 -274
- data/sidekiq.gemspec +12 -10
- data/web/assets/javascripts/application.js +19 -0
- data/web/assets/javascripts/base-charts.js +106 -0
- data/web/assets/javascripts/dashboard-charts.js +168 -0
- data/web/assets/javascripts/dashboard.js +3 -223
- data/web/assets/javascripts/metrics.js +117 -115
- data/web/assets/stylesheets/application-dark.css +4 -0
- data/web/assets/stylesheets/application-rtl.css +2 -91
- data/web/assets/stylesheets/application.css +23 -298
- 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 +2 -7
- data/web/locales/en.yml +76 -70
- data/web/locales/es.yml +68 -68
- data/web/locales/fa.yml +65 -65
- data/web/locales/fr.yml +81 -67
- data/web/locales/gd.yml +99 -0
- 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 +67 -69
- 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 +79 -69
- 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 +20 -18
- data/web/locales/zh-tw.yml +10 -1
- 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/_paging.erb +2 -0
- data/web/views/_poll_link.erb +1 -1
- data/web/views/busy.erb +42 -26
- data/web/views/dashboard.erb +36 -5
- data/web/views/metrics.erb +33 -20
- data/web/views/metrics_for_job.erb +25 -44
- data/web/views/morgue.erb +5 -9
- data/web/views/queue.erb +10 -14
- data/web/views/queues.erb +3 -1
- data/web/views/retries.erb +5 -9
- data/web/views/scheduled.erb +12 -13
- metadata +43 -33
- data/lib/sidekiq/delay.rb +0 -43
- 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/metrics/deploy.rb +0 -47
- data/lib/sidekiq/worker.rb +0 -370
- data/web/assets/javascripts/graph.js +0 -16
- /data/{LICENSE → LICENSE.txt} +0 -0
data/web/views/dashboard.erb
CHANGED
@@ -1,4 +1,7 @@
|
|
1
|
-
<script type="text/javascript" src="<%= root_path %>javascripts/
|
1
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
|
2
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
|
3
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
|
4
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/dashboard-charts.js"></script>
|
2
5
|
<script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js"></script>
|
3
6
|
<div class= "dashboard clearfix">
|
4
7
|
<h3 >
|
@@ -17,8 +20,26 @@
|
|
17
20
|
</div>
|
18
21
|
|
19
22
|
<div class="row chart">
|
20
|
-
<
|
21
|
-
<
|
23
|
+
<canvas id="realtime-chart"></canvas>
|
24
|
+
<script>
|
25
|
+
window.realtimeChart = new RealtimeChart(
|
26
|
+
document.getElementById("realtime-chart"),
|
27
|
+
<%= Sidekiq.dump_json({
|
28
|
+
processedLabel: t('Processed'),
|
29
|
+
failedLabel: t('Failed'),
|
30
|
+
labels: Array.new(50, ""),
|
31
|
+
processed: Array.new(50),
|
32
|
+
failed: Array.new(50),
|
33
|
+
updateUrl: "#{root_path}stats",
|
34
|
+
}) %>
|
35
|
+
)
|
36
|
+
</script>
|
37
|
+
|
38
|
+
<!-- start with a space in the legend so the height doesn't change when we add content dynamically -->
|
39
|
+
<div id="realtime-legend"> </div>
|
40
|
+
<script>
|
41
|
+
realtimeChart.registerLegend(document.getElementById("realtime-legend"))
|
42
|
+
</script>
|
22
43
|
</div>
|
23
44
|
|
24
45
|
<div class="row header">
|
@@ -34,8 +55,18 @@
|
|
34
55
|
<a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
|
35
56
|
</div>
|
36
57
|
|
37
|
-
<
|
38
|
-
<
|
58
|
+
<canvas id="history-chart"></canvas>
|
59
|
+
<script>
|
60
|
+
window.historyChart = new DashboardChart(
|
61
|
+
document.getElementById("history-chart"),
|
62
|
+
<%= Sidekiq.dump_json({
|
63
|
+
processedLabel: t('Processed'),
|
64
|
+
failedLabel: t('Failed'),
|
65
|
+
processed: @processed_history.to_a.reverse,
|
66
|
+
failed: @failed_history.to_a.reverse,
|
67
|
+
}) %>
|
68
|
+
)
|
69
|
+
</script>
|
39
70
|
</div>
|
40
71
|
|
41
72
|
<br/>
|
data/web/views/metrics.erb
CHANGED
@@ -1,8 +1,17 @@
|
|
1
1
|
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
|
2
2
|
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
|
3
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
|
3
4
|
<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
|
4
5
|
|
5
|
-
<
|
6
|
+
<div class="header-container">
|
7
|
+
<div class="page-title-container">
|
8
|
+
<h1><%= t('Metrics') %></h1>
|
9
|
+
|
10
|
+
<a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
|
11
|
+
</div>
|
12
|
+
|
13
|
+
<%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics" } %>
|
14
|
+
</div>
|
6
15
|
|
7
16
|
<%
|
8
17
|
table_limit = 20
|
@@ -11,30 +20,33 @@
|
|
11
20
|
visible_kls = job_results.first(chart_limit).map(&:first)
|
12
21
|
%>
|
13
22
|
|
14
|
-
|
15
|
-
|
16
|
-
<script>
|
17
|
-
window.jobMetricsChart = new JobMetricsOverviewChart(
|
18
|
-
"job-metrics-overview-chart",
|
19
|
-
<%= Sidekiq.dump_json({
|
20
|
-
series: job_results.map { |(kls, jr)| [kls, jr.dig("series", "s")] }.to_h,
|
21
|
-
marks: @query_result.marks.map { |m| [m.bucket, m.label] },
|
22
|
-
visible: visible_kls,
|
23
|
-
labels: @query_result.buckets,
|
24
|
-
}) %>
|
25
|
-
)
|
26
|
-
</script>
|
23
|
+
<% if job_results.any? %>
|
24
|
+
<canvas id="job-metrics-overview-chart"></canvas>
|
27
25
|
|
28
|
-
<
|
26
|
+
<script>
|
27
|
+
window.jobMetricsChart = new JobMetricsOverviewChart(
|
28
|
+
document.getElementById("job-metrics-overview-chart"),
|
29
|
+
<%= Sidekiq.dump_json({
|
30
|
+
series: job_results.map { |(kls, jr)| [kls, jr.dig("series", "s")] }.to_h,
|
31
|
+
marks: @query_result.marks.map { |m| [m.bucket, m.label] },
|
32
|
+
labels: @query_result.buckets,
|
33
|
+
visibleKls: visible_kls,
|
34
|
+
yLabel: t('TotalExecutionTime'),
|
35
|
+
units: t('Seconds').downcase,
|
36
|
+
markLabel: t('Deploy'),
|
37
|
+
}) %>
|
38
|
+
)
|
39
|
+
</script>
|
40
|
+
<% end %>
|
29
41
|
|
30
42
|
<div class="table_container">
|
31
43
|
<table class="table table-bordered table-striped table-hover">
|
32
44
|
<tbody>
|
33
45
|
<tr>
|
34
46
|
<th><%= t('Name') %></th>
|
35
|
-
<th><%= t('
|
36
|
-
<th><%= t('
|
37
|
-
<th><%= t('
|
47
|
+
<th><%= t('Success') %></th>
|
48
|
+
<th><%= t('Failure') %></th>
|
49
|
+
<th><%= t('TotalExecutionTime') %></th>
|
38
50
|
<th><%= t('AvgExecutionTime') %></th>
|
39
51
|
</tr>
|
40
52
|
<% if job_results.any? %>
|
@@ -48,12 +60,13 @@
|
|
48
60
|
id="<%= id %>"
|
49
61
|
class="metrics-swatch"
|
50
62
|
value="<%= kls %>"
|
63
|
+
<%= visible_kls.include?(kls) ? 'checked' : '' %>
|
51
64
|
/>
|
52
|
-
<code><a href="<%= root_path %>metrics/<%= kls %>"><%= kls %></a></code>
|
65
|
+
<code><a href="<%= root_path %>metrics/<%= kls %>?period=<%= @period %>"><%= kls %></a></code>
|
53
66
|
</div>
|
54
67
|
<script>jobMetricsChart.registerSwatch("<%= id %>")</script>
|
55
68
|
</td>
|
56
|
-
<td><%= jr.dig("totals", "p") %></td>
|
69
|
+
<td><%= jr.dig("totals", "p") - jr.dig("totals", "f") %></td>
|
57
70
|
<td><%= jr.dig("totals", "f") %></td>
|
58
71
|
<td><%= jr.dig("totals", "s").round(2) %> seconds</td>
|
59
72
|
<td><%= jr.total_avg("s").round(2) %> seconds</td>
|
@@ -1,85 +1,66 @@
|
|
1
1
|
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
|
2
2
|
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
|
3
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
|
3
4
|
<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
|
4
5
|
|
5
6
|
<%
|
6
7
|
job_result = @query_result.job_results[@name]
|
7
|
-
hist_totals = job_result.hist.values.first.zip(*job_result.hist.values[1..-1]).map(&:sum)
|
8
|
-
bucket_labels =Sidekiq::Metrics::Histogram::LABELS
|
9
|
-
bucket_intervals =Sidekiq::Metrics::Histogram::BUCKET_INTERVALS
|
10
|
-
|
11
|
-
# Replace INFINITY since it can't be represented as JSON
|
12
|
-
bucket_intervals[0] = bucket_intervals[1] * 2
|
8
|
+
hist_totals = job_result.hist.values.first.zip(*job_result.hist.values[1..-1]).map(&:sum).reverse
|
9
|
+
bucket_labels = Sidekiq::Metrics::Histogram::LABELS
|
10
|
+
bucket_intervals = Sidekiq::Metrics::Histogram::BUCKET_INTERVALS
|
13
11
|
%>
|
14
12
|
|
15
13
|
<% if job_result.totals["s"] > 0 %>
|
16
|
-
<div class="header-
|
17
|
-
<
|
18
|
-
<
|
19
|
-
|
20
|
-
|
21
|
-
|
14
|
+
<div class="header-container">
|
15
|
+
<div class="page-title-container">
|
16
|
+
<h1>
|
17
|
+
<a href="<%= root_path %>metrics?period=<%= @period %>"><%= t('Metrics') %></a> /
|
18
|
+
<%= h @name %>
|
19
|
+
</h1>
|
20
|
+
|
21
|
+
<a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
|
22
|
+
</div>
|
23
|
+
|
24
|
+
<%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics/#{@name}" } %>
|
22
25
|
</div>
|
23
26
|
|
24
27
|
<canvas id="hist-totals-chart"></canvas>
|
25
28
|
|
26
29
|
<script>
|
27
30
|
window.histTotalsChart = new HistTotalsChart(
|
28
|
-
"hist-totals-chart",
|
31
|
+
document.getElementById("hist-totals-chart"),
|
29
32
|
<%= Sidekiq.dump_json({
|
30
33
|
series: hist_totals,
|
31
34
|
labels: bucket_labels,
|
35
|
+
xLabel: t('ExecutionTime'),
|
36
|
+
yLabel: t('Jobs'),
|
37
|
+
units: t('Jobs').downcase,
|
32
38
|
}) %>
|
33
39
|
)
|
34
40
|
</script>
|
35
41
|
|
36
|
-
<h2>Performance over time</h2>
|
37
|
-
|
38
42
|
<canvas id="hist-bubble-chart"></canvas>
|
39
43
|
|
40
44
|
<script>
|
41
45
|
window.histBubbleChart = new HistBubbleChart(
|
42
|
-
"hist-bubble-chart",
|
46
|
+
document.getElementById("hist-bubble-chart"),
|
43
47
|
<%= Sidekiq.dump_json({
|
44
48
|
hist: job_result.hist,
|
45
49
|
marks: @query_result.marks.map { |m| [m.bucket, m.label] },
|
46
50
|
labels: @query_result.buckets,
|
47
51
|
histIntervals: bucket_intervals,
|
52
|
+
yLabel: t('ExecutionTime'),
|
53
|
+
markLabel: t('Deploy'),
|
54
|
+
yUnits: t('Seconds').downcase,
|
55
|
+
zUnits: t('Jobs').downcase,
|
48
56
|
}) %>
|
49
57
|
)
|
50
58
|
</script>
|
51
59
|
|
52
|
-
<div class="table_container">
|
53
|
-
<table class="table table-bordered table-striped table-hover">
|
54
|
-
<tbody>
|
55
|
-
<tr>
|
56
|
-
<th><%= t('Time') %></th>
|
57
|
-
<th><%= t('Processed') %></th>
|
58
|
-
<th><%= t('Failed') %></th>
|
59
|
-
<th><%= t('ExecutionTime') %></th>
|
60
|
-
<th><%= t('AvgExecutionTime') %></th>
|
61
|
-
</tr>
|
62
|
-
<% @query_result.buckets.reverse.each do |bucket| %>
|
63
|
-
<tr>
|
64
|
-
<td><%= bucket %></td>
|
65
|
-
<td><%= job_result.series.dig("p", bucket) %></td>
|
66
|
-
<td><%= job_result.series.dig("f", bucket) %></td>
|
67
|
-
<% if (total_sec = job_result.series.dig("s", bucket)) > 0 %>
|
68
|
-
<td><%= total_sec.round(2) %> seconds</td>
|
69
|
-
<td><%= job_result.series_avg("s")[bucket].round(2) %> seconds</td>
|
70
|
-
<% else %>
|
71
|
-
<td>—</td>
|
72
|
-
<td>—</td>
|
73
|
-
<% end %>
|
74
|
-
</tr>
|
75
|
-
<% end %>
|
76
|
-
</tbody>
|
77
|
-
</table>
|
78
|
-
</div>
|
79
60
|
<p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>
|
80
61
|
<% else %>
|
81
62
|
<h1>
|
82
|
-
<a href="<%= root_path %>/metrics"><%= t(
|
63
|
+
<a href="<%= root_path %>/metrics"><%= t('Metrics') %></a> /
|
83
64
|
<%= h @name %>
|
84
65
|
</h1>
|
85
66
|
|
data/web/views/morgue.erb
CHANGED
@@ -1,14 +1,10 @@
|
|
1
|
-
<
|
2
|
-
<
|
3
|
-
<h3><%= t('DeadJobs') %></h3>
|
4
|
-
</div>
|
1
|
+
<div class="header-container">
|
2
|
+
<h1><%= t('DeadJobs') %></h1>
|
5
3
|
<% if @dead.size > 0 && @total_size > @count %>
|
6
|
-
|
7
|
-
<%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
|
8
|
-
</div>
|
4
|
+
<%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
|
9
5
|
<% end %>
|
10
6
|
<%= filtering('dead') %>
|
11
|
-
</
|
7
|
+
</div>
|
12
8
|
|
13
9
|
<% if @dead.size > 0 %>
|
14
10
|
<form action="<%= root_path %>morgue" method="post">
|
@@ -33,7 +29,7 @@
|
|
33
29
|
<tr>
|
34
30
|
<td class="table-checkbox">
|
35
31
|
<label>
|
36
|
-
<input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
|
32
|
+
<input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
|
37
33
|
</label>
|
38
34
|
</td>
|
39
35
|
<td>
|
data/web/views/queue.erb
CHANGED
@@ -1,17 +1,13 @@
|
|
1
|
-
<
|
2
|
-
<
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
<div class="col-sm-4 pull-right flip">
|
12
|
-
<%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
|
13
|
-
</div>
|
14
|
-
</header>
|
1
|
+
<div class="header-container">
|
2
|
+
<h1><%= t('CurrentMessagesInQueue', :queue => h(@name)) %>
|
3
|
+
<% if @queue.paused? %>
|
4
|
+
<span class="label label-danger"><%= t('Paused') %></span>
|
5
|
+
<% end %>
|
6
|
+
<span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
|
7
|
+
</h1>
|
8
|
+
<%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
|
9
|
+
</div>
|
10
|
+
|
15
11
|
<div class="table_container">
|
16
12
|
<table class="queue table table-hover table-bordered table-striped">
|
17
13
|
<thead>
|
data/web/views/queues.erb
CHANGED
data/web/views/retries.erb
CHANGED
@@ -1,14 +1,10 @@
|
|
1
|
-
<
|
2
|
-
<
|
3
|
-
<h3><%= t('Retries') %></h3>
|
4
|
-
</div>
|
1
|
+
<div class="header-container">
|
2
|
+
<h1><%= t('Retries') %></h1>
|
5
3
|
<% if @retries.size > 0 && @total_size > @count %>
|
6
|
-
|
7
|
-
<%= erb :_paging, locals: { url: "#{root_path}retries" } %>
|
8
|
-
</div>
|
4
|
+
<%= erb :_paging, locals: { url: "#{root_path}retries" } %>
|
9
5
|
<% end %>
|
10
6
|
<%= filtering('retries') %>
|
11
|
-
</
|
7
|
+
</div>
|
12
8
|
|
13
9
|
<% if @retries.size > 0 %>
|
14
10
|
<form action="<%= root_path %>retries" method="post">
|
@@ -34,7 +30,7 @@
|
|
34
30
|
<tr>
|
35
31
|
<td class="table-checkbox">
|
36
32
|
<label>
|
37
|
-
<input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
|
33
|
+
<input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
|
38
34
|
</label>
|
39
35
|
</td>
|
40
36
|
<td>
|
data/web/views/scheduled.erb
CHANGED
@@ -1,25 +1,22 @@
|
|
1
|
-
<
|
2
|
-
<
|
3
|
-
<h3><%= t('ScheduledJobs') %></h3>
|
4
|
-
</div>
|
1
|
+
<div class="header-container">
|
2
|
+
<h1><%= t('ScheduledJobs') %></h1>
|
5
3
|
<% if @scheduled.size > 0 && @total_size > @count %>
|
6
|
-
|
7
|
-
<%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
|
8
|
-
</div>
|
4
|
+
<%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
|
9
5
|
<% end %>
|
10
6
|
<%= filtering('scheduled') %>
|
11
|
-
</
|
7
|
+
</div>
|
12
8
|
|
13
9
|
<% if @scheduled.size > 0 %>
|
14
|
-
|
15
10
|
<form action="<%= root_path %>scheduled" method="post">
|
16
11
|
<%= csrf_tag %>
|
17
12
|
<div class="table_container">
|
18
13
|
<table class="table table-striped table-bordered table-hover">
|
19
14
|
<thead>
|
20
15
|
<tr>
|
21
|
-
<th class="checkbox-column">
|
22
|
-
<
|
16
|
+
<th class="table-checkbox checkbox-column">
|
17
|
+
<label>
|
18
|
+
<input type="checkbox" class="check_all" />
|
19
|
+
</label>
|
23
20
|
</th>
|
24
21
|
<th><%= t('When') %></th>
|
25
22
|
<th><%= t('Queue') %></th>
|
@@ -29,8 +26,10 @@
|
|
29
26
|
</thead>
|
30
27
|
<% @scheduled.each do |entry| %>
|
31
28
|
<tr>
|
32
|
-
<td>
|
33
|
-
<
|
29
|
+
<td class="table-checkbox">
|
30
|
+
<label>
|
31
|
+
<input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
|
32
|
+
</label>
|
34
33
|
</td>
|
35
34
|
<td>
|
36
35
|
<a href="<%= root_path %>scheduled/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>
|
metadata
CHANGED
@@ -1,66 +1,74 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sidekiq
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 7.1.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mike Perham
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2023-09-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
-
name: redis
|
14
|
+
name: redis-client
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "<"
|
18
|
-
- !ruby/object:Gem::Version
|
19
|
-
version: '5'
|
20
17
|
- - ">="
|
21
18
|
- !ruby/object:Gem::Version
|
22
|
-
version:
|
19
|
+
version: 0.14.0
|
23
20
|
type: :runtime
|
24
21
|
prerelease: false
|
25
22
|
version_requirements: !ruby/object:Gem::Requirement
|
26
23
|
requirements:
|
27
|
-
- - "<"
|
28
|
-
- !ruby/object:Gem::Version
|
29
|
-
version: '5'
|
30
24
|
- - ">="
|
31
25
|
- !ruby/object:Gem::Version
|
32
|
-
version:
|
26
|
+
version: 0.14.0
|
33
27
|
- !ruby/object:Gem::Dependency
|
34
28
|
name: connection_pool
|
35
29
|
requirement: !ruby/object:Gem::Requirement
|
36
30
|
requirements:
|
37
31
|
- - ">="
|
38
32
|
- !ruby/object:Gem::Version
|
39
|
-
version: 2.
|
33
|
+
version: 2.3.0
|
40
34
|
type: :runtime
|
41
35
|
prerelease: false
|
42
36
|
version_requirements: !ruby/object:Gem::Requirement
|
43
37
|
requirements:
|
44
38
|
- - ">="
|
45
39
|
- !ruby/object:Gem::Version
|
46
|
-
version: 2.
|
40
|
+
version: 2.3.0
|
47
41
|
- !ruby/object:Gem::Dependency
|
48
42
|
name: rack
|
49
43
|
requirement: !ruby/object:Gem::Requirement
|
50
44
|
requirements:
|
51
|
-
- - "
|
45
|
+
- - ">="
|
52
46
|
- !ruby/object:Gem::Version
|
53
|
-
version:
|
47
|
+
version: 2.2.4
|
54
48
|
type: :runtime
|
55
49
|
prerelease: false
|
56
50
|
version_requirements: !ruby/object:Gem::Requirement
|
57
51
|
requirements:
|
58
|
-
- - "
|
52
|
+
- - ">="
|
53
|
+
- !ruby/object:Gem::Version
|
54
|
+
version: 2.2.4
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: concurrent-ruby
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - "<"
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: '2'
|
62
|
+
type: :runtime
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - "<"
|
59
67
|
- !ruby/object:Gem::Version
|
60
|
-
version: '2
|
68
|
+
version: '2'
|
61
69
|
description: Simple, efficient background processing for Ruby.
|
62
70
|
email:
|
63
|
-
-
|
71
|
+
- info@contribsys.com
|
64
72
|
executables:
|
65
73
|
- sidekiq
|
66
74
|
- sidekiqmon
|
@@ -68,7 +76,7 @@ extensions: []
|
|
68
76
|
extra_rdoc_files: []
|
69
77
|
files:
|
70
78
|
- Changes.md
|
71
|
-
- LICENSE
|
79
|
+
- LICENSE.txt
|
72
80
|
- README.md
|
73
81
|
- bin/sidekiq
|
74
82
|
- bin/sidekiqload
|
@@ -79,14 +87,13 @@ files:
|
|
79
87
|
- lib/generators/sidekiq/templates/job_test.rb.erb
|
80
88
|
- lib/sidekiq.rb
|
81
89
|
- lib/sidekiq/api.rb
|
90
|
+
- lib/sidekiq/capsule.rb
|
82
91
|
- lib/sidekiq/cli.rb
|
83
92
|
- lib/sidekiq/client.rb
|
84
93
|
- lib/sidekiq/component.rb
|
85
|
-
- lib/sidekiq/
|
86
|
-
- lib/sidekiq/
|
87
|
-
- lib/sidekiq/
|
88
|
-
- lib/sidekiq/extensions/class_methods.rb
|
89
|
-
- lib/sidekiq/extensions/generic_proxy.rb
|
94
|
+
- lib/sidekiq/config.rb
|
95
|
+
- lib/sidekiq/deploy.rb
|
96
|
+
- lib/sidekiq/embedded.rb
|
90
97
|
- lib/sidekiq/fetch.rb
|
91
98
|
- lib/sidekiq/job.rb
|
92
99
|
- lib/sidekiq/job_logger.rb
|
@@ -95,7 +102,6 @@ files:
|
|
95
102
|
- lib/sidekiq/launcher.rb
|
96
103
|
- lib/sidekiq/logger.rb
|
97
104
|
- lib/sidekiq/manager.rb
|
98
|
-
- lib/sidekiq/metrics/deploy.rb
|
99
105
|
- lib/sidekiq/metrics/query.rb
|
100
106
|
- lib/sidekiq/metrics/shared.rb
|
101
107
|
- lib/sidekiq/metrics/tracking.rb
|
@@ -123,17 +129,18 @@ files:
|
|
123
129
|
- lib/sidekiq/web/csrf_protection.rb
|
124
130
|
- lib/sidekiq/web/helpers.rb
|
125
131
|
- lib/sidekiq/web/router.rb
|
126
|
-
- lib/sidekiq/
|
132
|
+
- lib/sidekiq/worker_compatibility_alias.rb
|
127
133
|
- sidekiq.gemspec
|
128
134
|
- web/assets/images/apple-touch-icon.png
|
129
135
|
- web/assets/images/favicon.ico
|
130
136
|
- web/assets/images/logo.png
|
131
137
|
- web/assets/images/status.png
|
132
138
|
- web/assets/javascripts/application.js
|
139
|
+
- web/assets/javascripts/base-charts.js
|
133
140
|
- web/assets/javascripts/chart.min.js
|
134
141
|
- web/assets/javascripts/chartjs-plugin-annotation.min.js
|
142
|
+
- web/assets/javascripts/dashboard-charts.js
|
135
143
|
- web/assets/javascripts/dashboard.js
|
136
|
-
- web/assets/javascripts/graph.js
|
137
144
|
- web/assets/javascripts/metrics.js
|
138
145
|
- web/assets/stylesheets/application-dark.css
|
139
146
|
- web/assets/stylesheets/application-rtl.css
|
@@ -149,6 +156,7 @@ files:
|
|
149
156
|
- web/locales/es.yml
|
150
157
|
- web/locales/fa.yml
|
151
158
|
- web/locales/fr.yml
|
159
|
+
- web/locales/gd.yml
|
152
160
|
- web/locales/he.yml
|
153
161
|
- web/locales/hi.yml
|
154
162
|
- web/locales/it.yml
|
@@ -170,6 +178,7 @@ files:
|
|
170
178
|
- web/locales/zh-tw.yml
|
171
179
|
- web/views/_footer.erb
|
172
180
|
- web/views/_job_info.erb
|
181
|
+
- web/views/_metrics_period_select.erb
|
173
182
|
- web/views/_nav.erb
|
174
183
|
- web/views/_paging.erb
|
175
184
|
- web/views/_poll_link.erb
|
@@ -193,10 +202,11 @@ licenses:
|
|
193
202
|
- LGPL-3.0
|
194
203
|
metadata:
|
195
204
|
homepage_uri: https://sidekiq.org
|
196
|
-
bug_tracker_uri: https://github.com/
|
197
|
-
documentation_uri: https://github.com/
|
198
|
-
changelog_uri: https://github.com/
|
199
|
-
source_code_uri: https://github.com/
|
205
|
+
bug_tracker_uri: https://github.com/sidekiq/sidekiq/issues
|
206
|
+
documentation_uri: https://github.com/sidekiq/sidekiq/wiki
|
207
|
+
changelog_uri: https://github.com/sidekiq/sidekiq/blob/main/Changes.md
|
208
|
+
source_code_uri: https://github.com/sidekiq/sidekiq
|
209
|
+
rubygems_mfa_required: 'true'
|
200
210
|
post_install_message:
|
201
211
|
rdoc_options: []
|
202
212
|
require_paths:
|
@@ -205,14 +215,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
205
215
|
requirements:
|
206
216
|
- - ">="
|
207
217
|
- !ruby/object:Gem::Version
|
208
|
-
version: 2.
|
218
|
+
version: 2.7.0
|
209
219
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
210
220
|
requirements:
|
211
221
|
- - ">="
|
212
222
|
- !ruby/object:Gem::Version
|
213
223
|
version: '0'
|
214
224
|
requirements: []
|
215
|
-
rubygems_version: 3.
|
225
|
+
rubygems_version: 3.4.7
|
216
226
|
signing_key:
|
217
227
|
specification_version: 4
|
218
228
|
summary: Simple, efficient background processing for Ruby
|
data/lib/sidekiq/delay.rb
DELETED
@@ -1,43 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Sidekiq # :nodoc:
|
4
|
-
module Extensions
|
5
|
-
def self.enable_delay!
|
6
|
-
warn "Sidekiq's Delayed Extensions will be removed in Sidekiq 7.0", uplevel: 1
|
7
|
-
|
8
|
-
if defined?(::ActiveSupport)
|
9
|
-
require "sidekiq/extensions/active_record"
|
10
|
-
require "sidekiq/extensions/action_mailer"
|
11
|
-
|
12
|
-
# Need to patch Psych so it can autoload classes whose names are serialized
|
13
|
-
# in the delayed YAML.
|
14
|
-
Psych::Visitors::ToRuby.prepend(Sidekiq::Extensions::PsychAutoload)
|
15
|
-
|
16
|
-
ActiveSupport.on_load(:active_record) do
|
17
|
-
include Sidekiq::Extensions::ActiveRecord
|
18
|
-
end
|
19
|
-
ActiveSupport.on_load(:action_mailer) do
|
20
|
-
extend Sidekiq::Extensions::ActionMailer
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
require "sidekiq/extensions/class_methods"
|
25
|
-
Module.__send__(:include, Sidekiq::Extensions::Klass)
|
26
|
-
end
|
27
|
-
|
28
|
-
module PsychAutoload
|
29
|
-
def resolve_class(klass_name)
|
30
|
-
return nil if !klass_name || klass_name.empty?
|
31
|
-
# constantize
|
32
|
-
names = klass_name.split("::")
|
33
|
-
names.shift if names.empty? || names.first.empty?
|
34
|
-
|
35
|
-
names.inject(Object) do |constant, name|
|
36
|
-
constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
|
37
|
-
end
|
38
|
-
rescue NameError
|
39
|
-
super
|
40
|
-
end
|
41
|
-
end
|
42
|
-
end
|
43
|
-
end
|