sidekiq 5.2.8 → 6.0.0

data/web/assets/javascripts/dashboard.js

@@ -16,10 +16,8 @@ var gridSize=(this.orientation=="right"?1:-1)*this.graph.width;this.graph.vis.ap
 var nodes=vis.selectAll("path").data(series.stack.filter(function(d){return d.y!==null})).enter().append("svg:rect").attr("x",function(d){return graph.x(d.x)+barXOffset}).attr("y",function(d){return graph.y(d.y0+Math.abs(d.y))*(d.y<0?-1:1)}).attr("width",seriesBarWidth).attr("height",function(d){return graph.y.magnitude(Math.abs(d.y))}).attr("opacity",series.opacity).attr("transform",transform);Array.prototype.forEach.call(nodes[0],function(n){n.setAttribute("fill",series.color)});if(this.unstack)barXOffset+=seriesBarWidth},this)},_frequentInterval:function(data){var intervalCounts={};for(var i=0;i<data.length-1;i++){var interval=data[i+1].x-data[i].x;intervalCounts[interval]=intervalCounts[interval]||0;intervalCounts[interval]++}var frequentInterval={count:0,magnitude:1};var keysSorted=Rickshaw.keys(intervalCounts).sort(function asc(a,b){return Number(a)-Number(b)});keysSorted.forEach(function(i){if(frequentInterval.count<intervalCounts[i]){frequentInterval={count:intervalCounts[i],magnitude:i}}});return frequentInterval}});Rickshaw.namespace("Rickshaw.Graph.Renderer.Area");Rickshaw.Graph.Renderer.Area=Rickshaw.Class.create(Rickshaw.Graph.Renderer,{name:"area",defaults:function($super){return Rickshaw.extend($super(),{unstack:false,fill:false,stroke:false})},seriesPathFactory:function(){var graph=this.graph;var factory=d3.svg.area().x(function(d){return graph.x(d.x)}).y0(function(d){return graph.y(d.y0)}).y1(function(d){return graph.y(d.y+d.y0)}).interpolate(graph.interpolation).tension(this.tension);factory.defined&&factory.defined(function(d){return d.y!==null});return factory},seriesStrokeFactory:function(){var graph=this.graph;var factory=d3.svg.line().x(function(d){return graph.x(d.x)}).y(function(d){return graph.y(d.y+d.y0)}).interpolate(graph.interpolation).tension(this.tension);factory.defined&&factory.defined(function(d){return d.y!==null});return factory},render:function(args){args=args||{};var graph=this.graph;var series=args.series||graph.series;var vis=args.vis||graph.vis;vis.selectAll("*").remove();var method=this.unstack?"append":"insert";var data=series.filter(function(s){return!s.disabled}).map(function(s){return s.stack});var nodes=vis.selectAll("path").data(data).enter()[method]("svg:g","g");nodes.append("svg:path").attr("d",this.seriesPathFactory()).attr("class","area");if(this.stroke){nodes.append("svg:path").attr("d",this.seriesStrokeFactory()).attr("class","line")}var i=0;series.forEach(function(series){if(series.disabled)return;series.path=nodes[0][i++];this._styleSeries(series)},this)},_styleSeries:function(series){if(!series.path)return;d3.select(series.path).select(".area").attr("fill",series.color);if(this.stroke){d3.select(series.path).select(".line").attr("fill","none").attr("stroke",series.stroke||d3.interpolateRgb(series.color,"black")(.125)).attr("stroke-width",this.strokeWidth)}if(series.className){series.path.setAttribute("class",series.className)}}});Rickshaw.namespace("Rickshaw.Graph.Renderer.ScatterPlot");Rickshaw.Graph.Renderer.ScatterPlot=Rickshaw.Class.create(Rickshaw.Graph.Renderer,{name:"scatterplot",defaults:function($super){return Rickshaw.extend($super(),{unstack:true,fill:true,stroke:false,padding:{top:.01,right:.01,bottom:.01,left:.01},dotSize:4})},initialize:function($super,args){$super(args)},render:function(args){args=args||{};var graph=this.graph;var series=args.series||graph.series;var vis=args.vis||graph.vis;var dotSize=this.dotSize;vis.selectAll("*").remove();series.forEach(function(series){if(series.disabled)return;var opacity=series.opacity?series.opacity:1;var nodes=vis.selectAll("path").data(series.stack.filter(function(d){return d.y!==null})).enter().append("svg:circle").attr("cx",function(d){return graph.x(d.x)}).attr("cy",function(d){return graph.y(d.y)}).attr("r",function(d){return"r"in d?d.r:dotSize}).attr("opacity",function(d){return"opacity"in d?d.opacity:opacity});if(series.className){nodes.classed(series.className,true)}Array.prototype.forEach.call(nodes[0],function(n){n.setAttribute("fill",series.color)})},this)}});Rickshaw.namespace("Rickshaw.Graph.Renderer.Multi");Rickshaw.Graph.Renderer.Multi=Rickshaw.Class.create(Rickshaw.Graph.Renderer,{name:"multi",initialize:function($super,args){$super(args)},defaults:function($super){return Rickshaw.extend($super(),{unstack:true,fill:false,stroke:true})},configure:function($super,args){args=args||{};this.config=args;$super(args)},domain:function($super){this.graph.stackData();var domains=[];var groups=this._groups();this._stack(groups);groups.forEach(function(group){var data=group.series.filter(function(s){return!s.disabled}).map(function(s){return s.stack});if(!data.length)return;var domain=null;if(group.renderer&&group.renderer.domain){domain=group.renderer.domain(data)}else{domain=$super(data)}domains.push(domain)});var xMin=d3.min(domains.map(function(d){return d.x[0]}));var xMax=d3.max(domains.map(function(d){return d.x[1]}));var yMin=d3.min(domains.map(function(d){return d.y[0]}));var yMax=d3.max(domains.map(function(d){return d.y[1]}));return{x:[xMin,xMax],y:[yMin,yMax]}},_groups:function(){var graph=this.graph;var renderGroups={};graph.series.forEach(function(series){if(series.disabled)return;if(!renderGroups[series.renderer]){var ns="http://www.w3.org/2000/svg";var vis=document.createElementNS(ns,"g");graph.vis[0][0].appendChild(vis);var renderer=graph._renderers[series.renderer];var config={};var defaults=[this.defaults(),renderer.defaults(),this.config,this.graph];defaults.forEach(function(d){Rickshaw.extend(config,d)});renderer.configure(config);renderGroups[series.renderer]={renderer:renderer,series:[],vis:d3.select(vis)}}renderGroups[series.renderer].series.push(series)},this);var groups=[];Object.keys(renderGroups).forEach(function(key){var group=renderGroups[key];groups.push(group)});return groups},_stack:function(groups){groups.forEach(function(group){var series=group.series.filter(function(series){return!series.disabled});var data=series.map(function(series){return series.stack});if(!group.renderer.unstack){var layout=d3.layout.stack();var stackedData=Rickshaw.clone(layout(data));series.forEach(function(series,index){series._stack=Rickshaw.clone(stackedData[index])})}},this);return groups},render:function(){this.graph.series.forEach(function(series){if(!series.renderer){throw new Error("Each series needs a renderer for graph 'multi' renderer")}});this.graph.vis.selectAll("*").remove();var groups=this._groups();groups=this._stack(groups);groups.forEach(function(group){var series=group.series.filter(function(series){return!series.disabled});series.active=function(){return series};group.renderer.render({series:series,vis:group.vis});series.forEach(function(s){s.stack=s._stack||s.stack||s.data})})}});Rickshaw.namespace("Rickshaw.Graph.Renderer.LinePlot");Rickshaw.Graph.Renderer.LinePlot=Rickshaw.Class.create(Rickshaw.Graph.Renderer,{name:"lineplot",defaults:function($super){return Rickshaw.extend($super(),{unstack:true,fill:false,stroke:true,padding:{top:.01,right:.01,bottom:.01,left:.01},dotSize:3,strokeWidth:2})},seriesPathFactory:function(){var graph=this.graph;var factory=d3.svg.line().x(function(d){return graph.x(d.x)}).y(function(d){return graph.y(d.y)}).interpolate(this.graph.interpolation).tension(this.tension);factory.defined&&factory.defined(function(d){return d.y!==null});return factory},render:function(args){args=args||{};var graph=this.graph;var series=args.series||graph.series;var vis=args.vis||graph.vis;var dotSize=this.dotSize;vis.selectAll("*").remove();var data=series.filter(function(s){return!s.disabled}).map(function(s){return s.stack});var nodes=vis.selectAll("path").data(data).enter().append("svg:path").attr("d",this.seriesPathFactory());var i=0;series.forEach(function(series){if(series.disabled)return;series.path=nodes[0][i++];this._styleSeries(series)},this);series.forEach(function(series){if(series.disabled)return;var nodes=vis.selectAll("x").data(series.stack.filter(function(d){return d.y!==null})).enter().append("svg:circle").attr("cx",function(d){return graph.x(d.x)}).attr("cy",function(d){return graph.y(d.y)}).attr("r",function(d){return"r"in d?d.r:dotSize});Array.prototype.forEach.call(nodes[0],function(n){if(!n)return;n.setAttribute("data-color",series.color);n.setAttribute("fill","white");n.setAttribute("stroke",series.color);n.setAttribute("stroke-width",this.strokeWidth)}.bind(this))},this)}});Rickshaw.namespace("Rickshaw.Graph.Smoother");Rickshaw.Graph.Smoother=Rickshaw.Class.create({initialize:function(args){this.graph=args.graph;this.element=args.element;this.aggregationScale=1;this.build();this.graph.stackData.hooks.data.push({name:"smoother",orderPosition:50,f:this.transformer.bind(this)})},build:function(){var self=this;var $=jQuery;if(this.element){$(function(){$(self.element).slider({min:1,max:100,slide:function(event,ui){self.setScale(ui.value)}})})}},setScale:function(scale){if(scale<1){throw"scale out of range: "+scale}this.aggregationScale=scale;this.graph.update()},transformer:function(data){if(this.aggregationScale==1)return data;var aggregatedData=[];data.forEach(function(seriesData){var aggregatedSeriesData=[];while(seriesData.length){var avgX=0,avgY=0;var slice=seriesData.splice(0,this.aggregationScale);slice.forEach(function(d){avgX+=d.x/slice.length;avgY+=d.y/slice.length});aggregatedSeriesData.push({x:avgX,y:avgY})}aggregatedData.push(aggregatedSeriesData)}.bind(this));return aggregatedData}});Rickshaw.namespace("Rickshaw.Graph.Socketio");Rickshaw.Graph.Socketio=Rickshaw.Class.create(Rickshaw.Graph.Ajax,{request:function(){var socket=io.connect(this.dataURL);var self=this;socket.on("rickshaw",function(data){self.success(data)})}});Rickshaw.namespace("Rickshaw.Series");Rickshaw.Series=Rickshaw.Class.create(Array,{initialize:function(data,palette,options){options=options||{};this.palette=new Rickshaw.Color.Palette(palette);this.timeBase=typeof options.timeBase==="undefined"?Math.floor((new Date).getTime()/1e3):options.timeBase;var timeInterval=typeof options.timeInterval=="undefined"?1e3:options.timeInterval;this.setTimeInterval(timeInterval);if(data&&typeof data=="object"&&Array.isArray(data)){data.forEach(function(item){this.addItem(item)},this)}},addItem:function(item){if(typeof item.name==="undefined"){throw"addItem() needs a name"}item.color=item.color||this.palette.color(item.name);item.data=item.data||[];if(item.data.length===0&&this.length&&this.getIndex()>0){this[0].data.forEach(function(plot){item.data.push({x:plot.x,y:0})})}else if(item.data.length===0){item.data.push({x:this.timeBase-(this.timeInterval||0),y:0})}this.push(item);if(this.legend){this.legend.addLine(this.itemByName(item.name))}},addData:function(data,x){var index=this.getIndex();Rickshaw.keys(data).forEach(function(name){if(!this.itemByName(name)){this.addItem({name:name})}},this);this.forEach(function(item){item.data.push({x:x||(index*this.timeInterval||1)+this.timeBase,y:data[item.name]||0})},this)},getIndex:function(){return this[0]&&this[0].data&&this[0].data.length?this[0].data.length:0},itemByName:function(name){for(var i=0;i<this.length;i++){if(this[i].name==name)return this[i]}},setTimeInterval:function(iv){this.timeInterval=iv/1e3},setTimeBase:function(t){this.timeBase=t},dump:function(){var data={timeBase:this.timeBase,timeInterval:this.timeInterval,items:[]};this.forEach(function(item){var newItem={color:item.color,name:item.name,data:[]};item.data.forEach(function(plot){newItem.data.push({x:plot.x,y:plot.y})});data.items.push(newItem)});return data},load:function(data){if(data.timeInterval){this.timeInterval=data.timeInterval}if(data.timeBase){this.timeBase=data.timeBase}if(data.items){data.items.forEach(function(item){this.push(item);if(this.legend){this.legend.addLine(this.itemByName(item.name))}},this)}}});Rickshaw.Series.zeroFill=function(series){Rickshaw.Series.fill(series,0)};Rickshaw.Series.fill=function(series,fill){var x;var i=0;var data=series.map(function(s){return s.data});while(i<Math.max.apply(null,data.map(function(d){return d.length}))){x=Math.min.apply(null,data.filter(function(d){return d[i]}).map(function(d){return d[i].x}));data.forEach(function(d){if(!d[i]||d[i].x!=x){d.splice(i,0,{x:x,y:fill})}});i++}};Rickshaw.namespace("Rickshaw.Series.FixedDuration");Rickshaw.Series.FixedDuration=Rickshaw.Class.create(Rickshaw.Series,{initialize:function(data,palette,options){options=options||{};if(typeof options.timeInterval==="undefined"){throw new Error("FixedDuration series requires timeInterval")}if(typeof options.maxDataPoints==="undefined"){throw new Error("FixedDuration series requires maxDataPoints")}this.palette=new Rickshaw.Color.Palette(palette);this.timeBase=typeof options.timeBase==="undefined"?Math.floor((new Date).getTime()/1e3):options.timeBase;this.setTimeInterval(options.timeInterval);if(this[0]&&this[0].data&&this[0].data.length){this.currentSize=this[0].data.length;this.currentIndex=this[0].data.length}else{this.currentSize=0;this.currentIndex=0}this.maxDataPoints=options.maxDataPoints;if(data&&typeof data=="object"&&Array.isArray(data)){data.forEach(function(item){this.addItem(item)},this);this.currentSize+=1;this.currentIndex+=1}this.timeBase-=(this.maxDataPoints-this.currentSize)*this.timeInterval;if(typeof this.maxDataPoints!=="undefined"&&this.currentSize<this.maxDataPoints){for(var i=this.maxDataPoints-this.currentSize-1;i>1;i--){this.currentSize+=1;this.currentIndex+=1;this.forEach(function(item){item.data.unshift({x:((i-1)*this.timeInterval||1)+this.timeBase,y:0,i:i})},this)}}},addData:function($super,data,x){$super(data,x);this.currentSize+=1;this.currentIndex+=1;if(this.maxDataPoints!==undefined){while(this.currentSize>this.maxDataPoints){this.dropData()}}},dropData:function(){this.forEach(function(item){item.data.splice(0,1)});this.currentSize-=1},getIndex:function(){return this.currentIndex}});return Rickshaw});
 
 var poller;
-
 var realtimeGraph = function(updatePath) {
   var timeInterval = parseInt(localStorage.timeInterval || '5000');
-
   var graphElement = document.getElementById("realtime");
 
   var graph = new Rickshaw.Graph( {
@@ -30,8 +28,8 @@ var realtimeGraph = function(updatePath) {
     interpolation: 'linear',
 
     series: new Rickshaw.Series.FixedDuration([{ name: graphElement.dataset.failedLabel, color: '#B1003E' }, { name: graphElement.dataset.processedLabel, color: '#006f68' }], undefined, {
-        timeInterval: timeInterval,
-        maxDataPoints: 100,
+      timeInterval: timeInterval,
+      maxDataPoints: 100,
     })
   });
 
@@ -46,7 +44,6 @@ var realtimeGraph = function(updatePath) {
   var legend = document.querySelector('#realtime-legend');
   var Hover = Rickshaw.Class.create(Rickshaw.Graph.HoverDetail, {
     render: function(args) {
-
       legend.innerHTML = "";
 
       var timestamp = document.createElement('div');
@@ -68,7 +65,6 @@ var realtimeGraph = function(updatePath) {
 
         line.appendChild(swatch);
         line.appendChild(label);
-
         legend.appendChild(line);
 
         var dot = document.createElement('div');
@@ -77,11 +73,8 @@ var realtimeGraph = function(updatePath) {
         dot.style.borderColor = d.series.color;
 
         this.element.appendChild(dot);
-
         dot.className = 'dot active';
-
         this.show();
-
       }, this );
     }
   });
@@ -90,7 +83,6 @@ var realtimeGraph = function(updatePath) {
   var i = 0;
   poller = setInterval(function() {
     $.getJSON($("#history").data("update-url"), function(data) {
-
       if (i === 0) {
         var processed = data.sidekiq.processed;
         var failed = data.sidekiq.failed;
@@ -144,7 +136,6 @@ var historyGraph = function() {
     ]
   } );
   var x_axis = new Rickshaw.Graph.Axis.Time( { graph: graph } );
-
   var y_axis = new Rickshaw.Graph.Axis.Y({
     graph: graph,
     tickFormat: Rickshaw.Fixtures.Number.formatKMBT,
@@ -156,7 +147,6 @@ var historyGraph = function() {
   var legend = document.querySelector('#history-legend');
   var Hover = Rickshaw.Class.create(Rickshaw.Graph.HoverDetail, {
     render: function(args) {
-
       legend.innerHTML = "";
 
       var timestamp = document.createElement('div');
@@ -178,7 +168,6 @@ var historyGraph = function() {
 
         line.appendChild(swatch);
         line.appendChild(label);
-
         legend.appendChild(line);
 
         var dot = document.createElement('div');
@@ -187,11 +176,8 @@ var historyGraph = function() {
         dot.style.borderColor = d.series.color;
 
         this.element.appendChild(dot);
-
         dot.className = 'dot active';
-
         this.show();
-
       }, this );
     }
   });
@@ -216,7 +202,6 @@ var updateStatsSummary = function(data) {
   $('ul.summary li.retries span.count').html(data.retries.numberWithDelimiter())
   $('ul.summary li.enqueued span.count').html(data.enqueued.numberWithDelimiter())
   $('ul.summary li.dead span.count').html(data.dead.numberWithDelimiter())
-
 }
 
 var updateRedisStats = function(data) {
@@ -277,7 +262,6 @@ $(function(){
   $(document).on('mousemove', 'div.interval-slider input', function(){
     setSliderLabel($(this).val());
   });
-
 });
 
 // Reset graphs
@@ -300,13 +284,10 @@ var debounce = function(fn, timeout)
 
 window.onresize = function() {
   var prevWidth = window.innerWidth;
-  
   return debounce(function () {
     var currWidth = window.innerWidth;
-    
     if (prevWidth !== currWidth) {
       prevWidth = currWidth;
-      
       clearInterval(poller);
       resetGraphs();
       renderGraphs();

data/web/locales/ja.yml

@@ -33,11 +33,13 @@ ja:
   NextRetry: 再試行
   RetryCount: 再試行
   RetryNow: 今すぐ再試行
+  Kill: 強制終了
   LastRetry: 再試行履歴
   OriginallyFailed: 失敗
   AreYouSure: よろしいですか？
   DeleteAll: 全て削除
   RetryAll: 全て再試行
+  KillAll: 全て強制終了
   NoRetriesFound: 再試行するジョブはありません
   Error: エラー
   ErrorClass: エラークラス
@@ -58,7 +60,6 @@ ja:
   OneMonth: 1 ヶ月
   ThreeMonths: 3 ヶ月
   SixMonths: 6 ヶ月
-  Batches: バッチ
   Failures: 失敗
   DeadJobs: デッドジョブ
   NoDeadJobsFound: デッドジョブはありません

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.2.8
+  version: 6.0.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,27 +16,18 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
@@ -44,9 +35,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
@@ -54,36 +42,35 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0
 description: Simple, efficient background processing for Ruby.
 email:
 - mperham@gmail.com
 executables:
 - sidekiq
-- sidekiqctl
 extensions: []
 extra_rdoc_files: []
 files:
@@ -91,24 +78,28 @@ files:
 - ".github/contributing.md"
 - ".github/issue_template.md"
 - ".gitignore"
-- ".travis.yml"
+- ".standard.yml"
 - 3.0-Upgrade.md
 - 4.0-Upgrade.md
 - 5.0-Upgrade.md
+- 6.0-Upgrade.md
 - COMM-LICENSE
 - Changes.md
+- Ent-2.0-Upgrade.md
 - Ent-Changes.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - Pro-2.0-Upgrade.md
 - Pro-3.0-Upgrade.md
 - Pro-4.0-Upgrade.md
+- Pro-5.0-Upgrade.md
 - Pro-Changes.md
 - README.md
 - Rakefile
 - bin/sidekiq
-- bin/sidekiqctl
 - bin/sidekiqload
+- bin/sidekiqmon
 - code_of_conduct.md
 - lib/generators/sidekiq/templates/worker.rb.erb
 - lib/generators/sidekiq/templates/worker_spec.rb.erb
@@ -118,8 +109,6 @@ files:
 - lib/sidekiq/api.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
-- lib/sidekiq/core_ext.rb
-- lib/sidekiq/ctl.rb
 - lib/sidekiq/delay.rb
 - lib/sidekiq/exception_handler.rb
 - lib/sidekiq/extensions/action_mailer.rb
@@ -130,11 +119,11 @@ files:
 - lib/sidekiq/job_logger.rb
 - lib/sidekiq/job_retry.rb
 - lib/sidekiq/launcher.rb
-- lib/sidekiq/logging.rb
+- lib/sidekiq/logger.rb
 - lib/sidekiq/manager.rb
 - lib/sidekiq/middleware/chain.rb
 - lib/sidekiq/middleware/i18n.rb
-- lib/sidekiq/middleware/server/active_record.rb
+- lib/sidekiq/monitor.rb
 - lib/sidekiq/paginator.rb
 - lib/sidekiq/processor.rb
 - lib/sidekiq/rails.rb
@@ -216,14 +205,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple, efficient background processing for Ruby

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-services:
-  - redis-server
-rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - 2.6.0
-  - jruby-9.2.6.0

data/bin/sidekiqctl

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-require 'sidekiq/api'
-require 'sidekiq/ctl'
-
-if ARGV[0] == 'status'
-  Sidekiq::Ctl::Status.new.display(ARGV[1])
-else
-  if ARGV.length < 2
-    Sidekiq::Ctl.print_usage
-  else
-    stage = ARGV[0]
-    pidfile = ARGV[1]
-    timeout = ARGV[2].to_i
-    timeout = Sidekiq::Ctl::DEFAULT_KILL_TIMEOUT if timeout == 0
-
-    Sidekiq::Ctl.new(stage, pidfile, timeout)
-  end
-end

data/lib/sidekiq/core_ext.rb

@@ -1 +0,0 @@
-raise "no longer used, will be removed in 5.1"

data/lib/sidekiq/ctl.rb

@@ -1,221 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-require 'sidekiq/api'
-
-class Sidekiq::Ctl
-  DEFAULT_KILL_TIMEOUT = 10
-  CMD = File.basename($0)
-
-  attr_reader :stage, :pidfile, :kill_timeout
-
-  def self.print_usage
-    puts "#{CMD} - control Sidekiq from the command line."
-    puts
-    puts "Usage: #{CMD} quiet <pidfile> <kill_timeout>"
-    puts "       #{CMD} stop <pidfile> <kill_timeout>"
-    puts "       #{CMD} status <section>"
-    puts
-    puts "       <pidfile> is path to a pidfile"
-    puts "       <kill_timeout> is number of seconds to wait until Sidekiq exits"
-    puts "       (default: #{Sidekiq::Ctl::DEFAULT_KILL_TIMEOUT}), after which Sidekiq will be KILL'd"
-    puts
-    puts "       <section> (optional) view a specific section of the status output"
-    puts "       Valid sections are: #{Sidekiq::Ctl::Status::VALID_SECTIONS.join(', ')}"
-    puts
-    puts "Be sure to set the kill_timeout LONGER than Sidekiq's -t timeout.  If you want"
-    puts "to wait 60 seconds for jobs to finish, use `sidekiq -t 60` and `sidekiqctl stop"
-    puts " path_to_pidfile 61`"
-    puts
-  end
-
-  def initialize(stage, pidfile, timeout)
-    @stage = stage
-    @pidfile = pidfile
-    @kill_timeout = timeout
-
-    done('No pidfile given', :error) if !pidfile
-    done("Pidfile #{pidfile} does not exist", :warn) if !File.exist?(pidfile)
-    done('Invalid pidfile content', :error) if pid == 0
-
-    fetch_process
-
-    begin
-      send(stage)
-    rescue NoMethodError
-      done "Invalid command: #{stage}", :error
-    end
-  end
-
-  def fetch_process
-    Process.kill(0, pid)
-  rescue Errno::ESRCH
-    done "Process doesn't exist", :error
-  # We were not allowed to send a signal, but the process must have existed
-  # when Process.kill() was called.
-  rescue Errno::EPERM
-    return pid
-  end
-
-  def done(msg, error = nil)
-    puts msg
-    exit(exit_signal(error))
-  end
-
-  def exit_signal(error)
-    (error == :error) ? 1 : 0
-  end
-
-  def pid
-    @pid ||= File.read(pidfile).to_i
-  end
-
-  def quiet
-    `kill -TSTP #{pid}`
-  end
-
-  def stop
-    `kill -TERM #{pid}`
-    kill_timeout.times do
-      begin
-        Process.kill(0, pid)
-      rescue Errno::ESRCH
-        FileUtils.rm_f pidfile
-        done 'Sidekiq shut down gracefully.'
-      rescue Errno::EPERM
-        done 'Not permitted to shut down Sidekiq.'
-      end
-      sleep 1
-    end
-    `kill -9 #{pid}`
-    FileUtils.rm_f pidfile
-    done 'Sidekiq shut down forcefully.'
-  end
-  alias_method :shutdown, :stop
-
-  class Status
-    VALID_SECTIONS = %w[all version overview processes queues]
-    def display(section = nil)
-      section ||= 'all'
-      unless VALID_SECTIONS.include? section
-        puts "I don't know how to check the status of '#{section}'!"
-        puts "Try one of these: #{VALID_SECTIONS.join(', ')}"
-        return
-      end
-      send(section)
-    rescue StandardError => e
-      puts "Couldn't get status: #{e}"
-    end
-
-    def all
-      version
-      puts
-      overview
-      puts
-      processes
-      puts
-      queues
-    end
-
-    def version
-      puts "Sidekiq #{Sidekiq::VERSION}"
-      puts Time.now
-    end
-
-    def overview
-      puts '---- Overview ----'
-      puts "  Processed: #{delimit stats.processed}"
-      puts "     Failed: #{delimit stats.failed}"
-      puts "       Busy: #{delimit stats.workers_size}"
-      puts "   Enqueued: #{delimit stats.enqueued}"
-      puts "    Retries: #{delimit stats.retry_size}"
-      puts "  Scheduled: #{delimit stats.scheduled_size}"
-      puts "       Dead: #{delimit stats.dead_size}"
-    end
-
-    def processes
-      puts "---- Processes (#{process_set.size}) ----"
-      process_set.each_with_index do |process, index|
-        puts "#{process['identity']} #{tags_for(process)}"
-        puts "  Started: #{Time.at(process['started_at'])} (#{time_ago(process['started_at'])})"
-        puts "  Threads: #{process['concurrency']} (#{process['busy']} busy)"
-        puts "   Queues: #{split_multiline(process['queues'].sort, pad: 11)}"
-        puts '' unless (index+1) == process_set.size
-      end
-    end
-
-    COL_PAD = 2
-    def queues
-      puts "---- Queues (#{queue_data.size}) ----"
-      columns = {
-        name: [:ljust, (['name'] + queue_data.map(&:name)).map(&:length).max + COL_PAD],
-        size: [:rjust, (['size'] + queue_data.map(&:size)).map(&:length).max + COL_PAD],
-        latency: [:rjust, (['latency'] + queue_data.map(&:latency)).map(&:length).max + COL_PAD]
-      }
-      columns.each { |col, (dir, width)| print col.to_s.upcase.public_send(dir, width) }
-      puts
-      queue_data.each do |q|
-        columns.each do |col, (dir, width)|
-          print q.send(col).public_send(dir, width)
-        end
-        puts
-      end
-    end
-
-    private
-
-    def delimit(number)
-      number.to_s.reverse.scan(/.{1,3}/).join(',').reverse
-    end
-
-    def split_multiline(values, opts = {})
-      return 'none' unless values
-      pad = opts[:pad] || 0
-      max_length = opts[:max_length] || (80 - pad)
-      out = []
-      line = ''
-      values.each do |value|
-        if (line.length + value.length) > max_length
-          out << line
-          line = ' ' * pad
-        end
-        line << value + ', '
-      end
-      out << line[0..-3]
-      out.join("\n")
-    end
-
-    def tags_for(process)
-      tags = [
-        process['tag'],
-        process['labels'],
-        (process['quiet'] == 'true' ? 'quiet' : nil)
-      ].flatten.compact
-      tags.any? ? "[#{tags.join('] [')}]" : nil
-    end
-
-    def time_ago(timestamp)
-      seconds = Time.now - Time.at(timestamp)
-      return 'just now' if seconds < 60
-      return 'a minute ago' if seconds < 120
-      return "#{seconds.floor / 60} minutes ago" if seconds < 3600
-      return 'an hour ago' if seconds < 7200
-      "#{seconds.floor / 60 / 60} hours ago"
-    end
-
-    QUEUE_STRUCT = Struct.new(:name, :size, :latency)
-    def queue_data
-      @queue_data ||= Sidekiq::Queue.all.map do |q|
-        QUEUE_STRUCT.new(q.name, q.size.to_s, sprintf('%#.2f', q.latency))
-      end
-    end
-
-    def process_set
-      @process_set ||= Sidekiq::ProcessSet.new
-    end
-
-    def stats
-      @stats ||= Sidekiq::Stats.new
-    end
-  end
-end