sidekiq-status 2.1.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02846f130e9fc47945e6e85e03d2e5cb5033e1d5a55f8b9ade921b72839f3a4
-  data.tar.gz: e236b4fd1fd3b94387b31786fe0aff021904b1947cf3bc2b26e66fceb6e38ca2
+  metadata.gz: 7c4653623b20223d993b2c5f2ce82a1ee214083c1adb51530a76d82e4d2b3977
+  data.tar.gz: 6cee1ff677b1b964465e79facf5dd1e747c6747f9e99c7fd54e0330082a4b201
 SHA512:
-  metadata.gz: 274efd30dff5904a2c1b39c2940e6785f8a446aada35e2a6fe38e58ddbc22ce0866e84e487e2bebfa439ca7ed06f862ff30c15fd3df5c48a3b59f03a6eabb95b
-  data.tar.gz: 590bd3e108417ba70cfa7706885a524f014f80ead06aef364b113099620fb362cafa181c0640ef2adb9309891ed33b3bac41585944e9a091716bc4ae4cf553ef
+  metadata.gz: 99971994088169aa3ba0c21417557ce9d9fc072917b06c05a9cb7815f0405e331882f057d56079b41256f028c8248a780d9f74592a660a850959109a579519cc
+  data.tar.gz: aa7030ebbbb8161f5e9e81c3fac25357cac7bff62d810a3f785e9343c12c3a5839f94060d993aafc5381700b7803ca5e1de17dcb00762525eda6fa9a6bdb4725

data/.github/workflows/ci.yaml

@@ -0,0 +1,53 @@
+name: Ruby CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+        gemfile:
+          - 'gemfiles/sidekiq_6.1.gemfile'
+          - 'gemfiles/sidekiq_6.x.gemfile'
+          - 'gemfiles/sidekiq_7.x.gemfile'
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+          rubygems: latest
+      - name: Run tests
+        run: |
+          bundle exec rake test

data/CHANGELOG.md

@@ -1,23 +1,40 @@
+**Version 3.0.3**
+ - Fixes a Sidekiq warning about the deprecated `hmset` redis command (https://github.com/kenaniah/sidekiq-status/pull/37)
+
+**Version 3.0.2**
+ - Avoids setting statuses for non-status jobs when an exception is thrown (https://github.com/kenaniah/sidekiq-status/pull/32)
+
+**Version 3.0.1**
+ - Adds elapsed time and ETA to the job status page (https://github.com/kenaniah/sidekiq-status/pull/13)
+
+**Version 3.0.0**
+ - Drops support for Sidekiq 5.x
+ - Adds support for Sidekiq 7.x
+ - Migrates from Travis CI to GitHub Actions
+
+**Version 2.1.3**
+ - Fixes redis deprecation warnings (https://github.com/kenaniah/sidekiq-status/issues/11)
+
 **Version 2.1.2**
- * Casts values to strings when HTML-encoding
+ - Casts values to strings when HTML-encoding
 
 **Version 2.1.1**
- * Ensures parameter outputs are properly HTML-encoded
+ - Ensures parameter outputs are properly HTML-encoded
 
 **Version 2.1.0**
- * Adds support for Sidekiq 6.2.2+ (https://github.com/mperham/sidekiq/issues/4955)
+ - Adds support for Sidekiq 6.2.2+ (https://github.com/mperham/sidekiq/issues/4955)
 
 **Version 2.0.2**
- * Fixes for dark mode theme
+ - Fixes for dark mode theme
 
 **Version 2.0.1**
- * Adds support for dark mode to the job status page
+ - Adds support for dark mode to the job status page
 
 **Version 2.0.0**
- * Adds support for Ruby 2.7, 3.0
- * Adds support for Sidekiq 6.x
- * Removes support for Ruby 2.3, 2.4, 2.5
- * Removes support for Sidekiq 3.x, 4.x
+ - Adds support for Ruby 2.7, 3.0
+ - Adds support for Sidekiq 6.x
+ - Removes support for Ruby 2.3, 2.4, 2.5
+ - Removes support for Sidekiq 3.x, 4.x
 
 **Versions 1.1.4 and prior**
 

data/README.md

@@ -1,11 +1,10 @@
 # Sidekiq::Status
 [![Gem Version](https://badge.fury.io/rb/sidekiq-status.svg)](https://badge.fury.io/rb/sidekiq-status)
-[![Build Status](https://www.travis-ci.com/kenaniah/sidekiq-status.svg?branch=main)](https://www.travis-ci.com/github/kenaniah/sidekiq-status)
-[![Inline docs](https://inch-ci.org/github/kenaniah/sidekiq-status.svg?branch=main)](https://inch-ci.org/github/kenaniah/sidekiq-status)
+[![Build Status](https://github.com/kenaniah/sidekiq-status/actions/workflows/ci.yaml/badge.svg)](https://github.com/kenaniah/sidekiq-status/actions/)
 
 Sidekiq-status is an extension to [Sidekiq](https://github.com/mperham/sidekiq) that tracks information about your Sidekiq and provides a UI to that purpose. It was inspired by [resque-status](https://github.com/quirkey/resque-status).
 
-Requires Ruby 2.6+ and Sidekiq 5.0+ or newer.
+Requires Ruby 2.6+ and Sidekiq 6.0+ or newer.
 
 ## Installation
 
@@ -21,6 +20,10 @@ Or install it yourself as:
 gem install sidekiq-status
 ```
 
+### Migrating to Version 3.x from 2.x
+
+Version 3.0.0 adds support for Sidekiq 7.x, but drops support for Sidekiq 5.x. **You should be able to upgrade cleanly from version 2.x to 3.x provided you are running Sidekiq 6.x or newer.**
+
 #### Migrating to Version 2.x from 1.x
 
 Version 2.0.0 was published in order to add support for Ruby 3.0 and Sidekiq 6.x and to remove support for versions of both that are now end-of-life. **You should be able to upgrade cleanly from version 1.x to 2.x provided you are running Sidekiq 5.x or newer.**
@@ -46,15 +49,15 @@ require 'sidekiq-status'
 
 Sidekiq.configure_client do |config|
   # accepts :expiration (optional)
-  Sidekiq::Status.configure_client_middleware config, expiration: 30.minutes
+  Sidekiq::Status.configure_client_middleware config, expiration: 30.minutes.to_i
 end
 
 Sidekiq.configure_server do |config|
   # accepts :expiration (optional)
-  Sidekiq::Status.configure_server_middleware config, expiration: 30.minutes
+  Sidekiq::Status.configure_server_middleware config, expiration: 30.minutes.to_i
 
   # accepts :expiration (optional)
-  Sidekiq::Status.configure_client_middleware config, expiration: 30.minutes
+  Sidekiq::Status.configure_client_middleware config, expiration: 30.minutes.to_i
 end
 ```
 
@@ -175,6 +178,8 @@ Sidekiq::Status::at      job_id #=> 5
 Sidekiq::Status::total   job_id #=> 100
 Sidekiq::Status::message job_id #=> "Almost done"
 Sidekiq::Status::pct_complete job_id #=> 5
+Sidekiq::Status::working_at job_id #=> 2718
+Sidekiq::Status::update_time job_id #=> 2819
 ```
 
 ### Unscheduling

data/gemfiles/{sidekiq_5.x.gemfile → sidekiq_7.x.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "sidekiq", "~> 5"
+gem "sidekiq", "~> 7"
 
 gemspec path: "../"

data/lib/sidekiq-status/client_middleware.rb

@@ -48,7 +48,7 @@ module Sidekiq::Status
 
     def display_args(msg, queue)
       job = JOB_CLASS.new(msg, queue)
-      return job.display_args.to_a.empty? ? nil : job.display_args.to_json
+      return job.display_args.to_a.empty? ? "{}" : job.display_args.to_json
     rescue Exception => e
       # For Sidekiq ~> 2.7
       return msg['args'].to_a.empty? ? nil : msg['args'].to_json

data/lib/sidekiq-status/redis_adapter.rb

@@ -0,0 +1,18 @@
+# adapter for redis-rb client
+class Sidekiq::Status::RedisAdapter
+  def initialize(client)
+    @client = client
+  end
+
+  def scan(**options, &block)
+    @client.scan_each(**options, &block)
+  end
+
+  def schedule_batch(key, options)
+    @client.zrangebyscore key, options[:start], options[:end], limit: [options[:offset], options[:limit]]
+  end
+
+  def method_missing(method, *args)
+    @client.send(method, *args)
+  end
+end

data/lib/sidekiq-status/redis_client_adapter.rb

@@ -0,0 +1,14 @@
+# adapter for redis-client client
+class Sidekiq::Status::RedisClientAdapter
+  def initialize(client)
+    @client = client
+  end
+
+  def schedule_batch(key, options)
+    @client.zrange(key, options[:start], options[:end], :byscore, :limit, options[:offset], options[:limit])
+  end
+
+  def method_missing(method, *args)
+    @client.send(method, *args)
+  end
+end

data/lib/sidekiq-status/server_middleware.rb

@@ -43,26 +43,28 @@ module Sidekiq::Status
         return
       end
 
-      # Determine job expiration
-      expiry = job_class.new.expiration || @expiration rescue @expiration
-
-      store_status worker.jid, :working,  expiry
-      yield
-      store_status worker.jid, :complete, expiry
-    rescue Worker::Stopped
-      store_status worker.jid, :stopped, expiry
-    rescue SystemExit, Interrupt
-      store_status worker.jid, :interrupted, expiry
-      raise
-    rescue Exception
-      status = :failed
-      if msg['retry']
-        if retry_attempt_number(msg) < retry_attempts_from(msg['retry'], DEFAULT_MAX_RETRY_ATTEMPTS)
-          status = :retrying
+      begin
+        # Determine job expiration
+        expiry = job_class.new.expiration || @expiration rescue @expiration
+
+        store_status worker.jid, :working,  expiry
+        yield
+        store_status worker.jid, :complete, expiry
+      rescue Worker::Stopped
+        store_status worker.jid, :stopped, expiry
+      rescue SystemExit, Interrupt
+        store_status worker.jid, :interrupted, expiry
+        raise
+      rescue Exception
+        status = :failed
+        if msg['retry']
+          if retry_attempt_number(msg) < retry_attempts_from(msg['retry'], DEFAULT_MAX_RETRY_ATTEMPTS)
+            status = :retrying
+          end
         end
+        store_status(worker.jid, status, expiry) if job_class && job_class.ancestors.include?(Sidekiq::Status::Worker)
+        raise
       end
-      store_status(worker.jid, status, expiry) if job_class && job_class.ancestors.include?(Sidekiq::Status::Worker)
-      raise
     end
 
     private

data/lib/sidekiq-status/storage.rb

@@ -12,11 +12,12 @@ module Sidekiq::Status::Storage
   # @param [ConnectionPool] redis_pool optional redis connection pool
   # @return [String] Redis operation status code
   def store_for_id(id, status_updates, expiration = nil, redis_pool=nil)
+    status_updates.transform_values!(&:to_s)
     redis_connection(redis_pool) do |conn|
-      conn.multi do
-        conn.hmset  key(id), 'update_time', Time.now.to_i, *(status_updates.to_a.flatten(1))
-        conn.expire key(id), (expiration || Sidekiq::Status::DEFAULT_EXPIRY)
-        conn.publish "status_updates", id
+      conn.multi do |pipeline|
+        pipeline.hset  key(id), 'update_time', Time.now.to_i, *(status_updates.to_a.flatten(1))
+        pipeline.expire key(id), (expiration || Sidekiq::Status::DEFAULT_EXPIRY)
+        pipeline.publish "status_updates", id
       end[0]
     end
   end
@@ -36,7 +37,7 @@ module Sidekiq::Status::Storage
   # @param [String] id job id
   # @param [Num] job_unix_time, unix timestamp for the scheduled job
   def delete_and_unschedule(job_id, job_unix_time = nil)
-    Sidekiq.redis do |conn|
+    Sidekiq::Status.redis_adapter do |conn|
       scan_options = {offset: 0, conn: conn, start: (job_unix_time || '-inf'), end: (job_unix_time || '+inf')}
 
       while not (jobs = schedule_batch(scan_options)).empty?
@@ -66,7 +67,7 @@ module Sidekiq::Status::Storage
   # @param [String] Symbol field fetched field name
   # @return [String] Redis operation status code
   def read_field_for_id(id, field)
-    Sidekiq.redis do |conn|
+    Sidekiq::Status.redis_adapter do |conn|
       conn.hget(key(id), field)
     end
   end
@@ -75,8 +76,8 @@ module Sidekiq::Status::Storage
   # @param [String] id job id
   # @return [Hash] Hash stored in redis
   def read_hash_for_id(id)
-    Sidekiq.redis do |conn|
-      conn.hgetall key(id)
+    Sidekiq::Status.redis_adapter do |conn|
+      conn.hgetall(key(id))
     end
   end
 
@@ -90,7 +91,7 @@ module Sidekiq::Status::Storage
   #  -  end: end score (i.e. +inf or a unix timestamp)
   #  -  offset: current progress through (all) jobs (e.g.: 100 if you want jobs from 100 to BATCH_LIMIT)
   def schedule_batch(options)
-    options[:conn].zrangebyscore "schedule", options[:start], options[:end], limit: [options[:offset], BATCH_LIMIT]
+    Sidekiq::Status.wrap_redis_connection(options[:conn]).schedule_batch("schedule", options.merge(limit: BATCH_LIMIT))
   end
 
   # Searches the jobs Array for the job_id

data/lib/sidekiq-status/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Status
-    VERSION = '2.1.2'
+    VERSION = '3.0.3'
   end
 end

data/lib/sidekiq-status/web.rb

@@ -8,7 +8,7 @@ module Sidekiq::Status
 
     DEFAULT_PER_PAGE_OPTS = [25, 50, 100].freeze
     DEFAULT_PER_PAGE = 25
-    COMMON_STATUS_HASH_KEYS = %w(update_time jid status worker args label pct_complete total at message)
+    COMMON_STATUS_HASH_KEYS = %w(update_time jid status worker args label pct_complete total at message working_at elapsed eta)
 
     class << self
       def per_page_opts= arr
@@ -48,6 +48,8 @@ module Sidekiq::Status
         def add_details_to_status(status)
           status['label'] = status_label(status['status'])
           status["pct_complete"] ||= pct_complete(status)
+          status["elapsed"] ||= elapsed(status).to_s
+          status["eta"] ||= eta(status).to_s
           status["custom"] = process_custom_data(status)
           return status
         end
@@ -61,6 +63,19 @@ module Sidekiq::Status
           Sidekiq::Status::pct_complete(status['jid']) || 0
         end
 
+        def elapsed(status)
+          case status['status']
+          when 'complete'
+            Sidekiq::Status.update_time(status['jid']) - Sidekiq::Status.working_at(status['jid'])
+          when 'working', 'retrying'
+            Time.now.to_i - Sidekiq::Status.working_at(status['jid'])
+          end
+        end
+
+        def eta(status)
+          Sidekiq::Status.eta(status['jid']) if status['status'] == 'working'
+        end
+
         def status_label(status)
           case status
           when 'complete'
@@ -81,8 +96,8 @@ module Sidekiq::Status
 
       app.get '/statuses' do
 
-        jids = Sidekiq.redis do |conn|
-          conn.scan_each(match: 'sidekiq:status:*', count: 100).map do |key|
+        jids = Sidekiq::Status.redis_adapter do |conn|
+          conn.scan(match: 'sidekiq:status:*', count: 100).map do |key|
             key.split(':').last
           end.uniq
         end
@@ -122,6 +137,8 @@ module Sidekiq::Status
           {id: "status", name: "Status", class: nil, url: nil},
           {id: "update_time", name: "Last Updated", class: nil, url: nil},
           {id: "pct_complete", name: "Progress", class: nil, url: nil},
+          {id: "elapsed", name: "Time Elapsed", class: nil, url: nil},
+          {id: "eta", name: "ETA", class: nil, url: nil},
         ]
 
         @headers.each do |h|

data/lib/sidekiq-status/worker.rb

@@ -11,14 +11,14 @@ module Sidekiq::Status::Worker
   # @param [Hash] status_updates updated values
   # @return [String] Redis operation status code
   def store(hash)
-    store_for_id @provider_job_id || @job_id || @jid, hash, @expiration
+    store_for_id @provider_job_id || @job_id || @jid || "", hash, @expiration
   end
 
   # Read value from job status hash
   # @param String|Symbol hask key
   # @return [String]
   def retrieve(name)
-    read_field_for_id @provider_job_id || @job_id || @jid, name
+    read_field_for_id @provider_job_id || @job_id || @jid || "", name
   end
 
   # Sets current task progress
@@ -29,7 +29,7 @@ module Sidekiq::Status::Worker
   def at(num, message = nil)
     @_status_total = 100 if @_status_total.nil?
     pct_complete = ((num / @_status_total.to_f) * 100).to_i rescue 0
-    store(at: num, total: @_status_total, pct_complete: pct_complete, message: message)
+    store(at: num, total: @_status_total, pct_complete: pct_complete, message: message, working_at: working_at)
   end
 
   # Sets total number of tasks
@@ -37,7 +37,12 @@ module Sidekiq::Status::Worker
   # @return [String]
   def total(num)
     @_status_total = num
-    store(total: num)
+    store(total: num, working_at: working_at)
   end
 
+  private
+
+  def working_at
+    @working_at ||= Time.now.to_i
+  end
 end

data/lib/sidekiq-status.rb

@@ -2,6 +2,8 @@ require 'sidekiq-status/version'
 require 'sidekiq-status/sidekiq_extensions'
 require 'sidekiq-status/storage'
 require 'sidekiq-status/worker'
+require 'sidekiq-status/redis_client_adapter'
+require 'sidekiq-status/redis_adapter'
 require 'sidekiq-status/client_middleware'
 require 'sidekiq-status/server_middleware'
 require 'sidekiq-status/web' if defined?(Sidekiq::Web)
@@ -61,8 +63,35 @@ module Sidekiq::Status
       get(job_id, :pct_complete).to_i
     end
 
+    def working_at(job_id)
+      (get(job_id, :working_at) || Time.now).to_i
+    end
+
+    def update_time(job_id)
+      (get(job_id, :update_time) || Time.now).to_i
+    end
+
+    def eta(job_id)
+      at = at(job_id)
+      return nil if at.zero?
+
+      (Time.now.to_i - working_at(job_id)).to_f / at * (total(job_id) - at)
+    end
+
     def message(job_id)
       get(job_id, :message)
     end
+
+    def wrap_redis_connection(conn)
+      if Sidekiq.major_version >= 7
+        conn.is_a?(RedisClientAdapter) ? conn : RedisClientAdapter.new(conn)
+      else
+        conn.is_a?(RedisAdapter) ? conn : RedisAdapter.new(conn)
+      end
+    end
+
+    def redis_adapter
+      Sidekiq.redis { |conn| yield wrap_redis_connection(conn) }
+    end
   end
 end

data/sidekiq-status.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Sidekiq::Status::VERSION
 
-  gem.add_dependency                  'sidekiq', '>= 5.0'
+  gem.add_dependency                  'sidekiq', '>= 6.0', '< 8'
   gem.add_dependency                  'chronic_duration'
   gem.add_development_dependency      'appraisal'
   gem.add_development_dependency      'colorize'

data/spec/lib/sidekiq-status/server_middleware_spec.rb

@@ -9,8 +9,9 @@ describe Sidekiq::Status::ServerMiddleware do
     it "sets working/complete status" do
       allow(SecureRandom).to receive(:hex).once.and_return(job_id)
       start_server do
-        thread = redis_thread 4, "status_updates", "job_messages_#{job_id}"
-        expect(ConfirmationJob.perform_async 'arg1' => 'val1').to eq(job_id)
+        thread = branched_redis_thread 4, "status_updates", "job_messages_#{job_id}" do
+          expect(ConfirmationJob.perform_async 'arg1' => 'val1').to eq(job_id)
+        end
         expect(thread.value).to eq([
           job_id,
           job_id,
@@ -60,6 +61,22 @@ describe Sidekiq::Status::ServerMiddleware do
         end
         expect(redis.hget("sidekiq:status:#{job_id}", :status)).to be_nil
       end
+
+      it "should not set any status on system exit signal" do
+        allow(SecureRandom).to receive(:hex).once.and_return(job_id)
+        start_server do
+          expect(ExitedNoStatusJob.perform_async).to eq(job_id)
+        end
+        expect(redis.hget("sidekiq:status:#{job_id}", :status)).to be_nil
+      end
+
+      it "should not set any status on interrupt signal" do
+        allow(SecureRandom).to receive(:hex).once.and_return(job_id)
+        start_server do
+          expect(InterruptedNoStatusJob.perform_async).to eq(job_id)
+        end
+        expect(redis.hget("sidekiq:status:#{job_id}", :status)).to be_nil
+      end
     end
 
     context "sets interrupted status" do

data/spec/lib/sidekiq-status/worker_spec.rb

@@ -20,4 +20,22 @@ describe Sidekiq::Status::Worker do
       expect(subject.expiration).to eq(:val)
     end
   end
+
+  describe ".at" do
+    subject { StubJob.new }
+
+    it "records when the worker has started" do
+      expect { subject.at(0) }.to(change { subject.retrieve('working_at') })
+    end
+
+    context "when setting the total for the worker" do
+      it "records when the worker has started" do
+        expect { subject.total(100) }.to(change { subject.retrieve('working_at') })
+      end
+    end
+
+    it "records when the worker last worked" do
+      expect { subject.at(0) }.to(change { subject.retrieve('update_time') })
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -60,8 +60,47 @@ def redis_thread messages_limit, *channels
 
 end
 
+def redis_client_thread message_limit, *channels
+  thread = Thread.new {
+    messages = []
+    Sidekiq.redis do |conn|
+      puts "Subscribing to #{channels} for #{message_limit.to_s.bold} messages".cyan if ENV['DEBUG']
+      pubsub = conn.pubsub
+      pubsub.call("SUBSCRIBE", *channels)
+
+      timeouts = 0
+      loop do
+        type, ch, msg = pubsub.next_event(2)
+        next if type == "subscribe"
+        if msg
+          puts "Message received: #{ch} -> #{msg}".white if ENV['DEBUG']
+          messages << msg
+          break if messages.length >= message_limit
+        else
+          # no new message was received in the allocated timeout
+          timeouts += 1
+          break if timeouts >= 30
+        end
+      end
+    end
+    puts "Returing from thread".cyan if ENV['DEBUG']
+    messages
+  }
+  sleep 0.1
+  yield if block_given?
+  thread.join
+end
+
+def branched_redis_thread n, *channels, &block
+  if Sidekiq.major_version < 7
+    redis_thread(n, *channels, &block)
+  else
+    redis_client_thread(n, *channels, &block)
+  end
+end
+
 def capture_status_updates n, &block
-  redis_thread(n, "status_updates", &block).value
+  branched_redis_thread(n, "status_updates", &block).value
 end
 
 # Configures server middleware and launches a sidekiq server
@@ -76,20 +115,19 @@ def start_server server_middleware_options = {}
 
     # Load and configure server options
     require 'sidekiq/cli'
-    Sidekiq.options[:queues] << 'default'
-    Sidekiq.options[:require] = File.expand_path 'environment.rb', File.dirname(__FILE__)
-    Sidekiq.options[:timeout] = 1
-    Sidekiq.options[:concurrency] = 5
 
     # Add the server middleware
     Sidekiq.configure_server do |config|
-      config.redis = Sidekiq::RedisConnection.create
+      config.concurrency = 5
+      config.redis = Sidekiq::RedisConnection.create if Sidekiq.major_version < 7
       Sidekiq::Status.configure_server_middleware config, server_middleware_options
     end
 
     # Launch
     puts "Server starting".yellow if ENV['DEBUG']
-    Sidekiq::CLI.instance.run
+    instance = Sidekiq::CLI.instance
+    instance.parse(['-r', File.expand_path('environment.rb', File.dirname(__FILE__))])
+    instance.run
 
   end
 

data/spec/support/test_jobs.rb

@@ -111,12 +111,24 @@ class ExitedJob < StubJob
   end
 end
 
+class ExitedNoStatusJob < StubNoStatusJob
+  def perform
+    raise SystemExit
+  end
+end
+
 class InterruptedJob < StubJob
   def perform
     raise Interrupt
   end
 end
 
+class InterruptedNoStatusJob < StubNoStatusJob
+  def perform
+    raise Interrupt
+  end
+end
+
 class RetriedJob < StubJob
 
   sidekiq_options retry: true

data/web/views/status.erb

@@ -67,6 +67,32 @@
       </div>
     </div>
 
+    <div class="row">
+      <div class="col-sm-2">
+        <strong>Elapsed Time</strong>
+      </div>
+      <div class="col-sm-10">
+        <p>
+          <% if @status["elapsed"] %>
+            <%= ChronicDuration.output(@status["elapsed"].to_i, :weeks => true, :units => 2) %>
+          <% end %>
+        </p>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-sm-2">
+        <strong>ETA</strong>
+      </div>
+      <div class="col-sm-10">
+        <p>
+          <% if @status["eta"] %>
+            <%= ChronicDuration.output(@status["eta"].to_i, :weeks => true, :units => 2) %>
+          <% end %>
+        </p>
+      </div>
+    </div>
+
     <% if @status["custom"].any? %>
       <hr>
       <% @status["custom"].each do |key, val| %>

data/web/views/statuses.erb

@@ -119,6 +119,16 @@ function setPerPage(select){
           <% end %>
         </div>
       </td>
+      <td style='text-align: center; white-space: nowrap;'>
+        <% if container["elapsed"] %>
+          <%= ChronicDuration.output(container["elapsed"].to_i, :weeks => true, :units => 2) %>
+        <% end %>
+      </td>
+      <td style='text-align: center; white-space: nowrap;'>
+        <% if container["eta"] %>
+          <%= ChronicDuration.output(container["eta"].to_i, :weeks => true, :units => 2) %>
+        <% end %>
+      </td>
       <td>
         <div class="actions">
           <form action="statuses" method="post">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-status
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Evgeniy Tsvigun
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2023-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -17,14 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
@@ -131,21 +137,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/sidekiq_5.x.gemfile
 - gemfiles/sidekiq_6.1.gemfile
 - gemfiles/sidekiq_6.x.gemfile
+- gemfiles/sidekiq_7.x.gemfile
 - lib/sidekiq-status.rb
 - lib/sidekiq-status/client_middleware.rb
+- lib/sidekiq-status/redis_adapter.rb
+- lib/sidekiq-status/redis_client_adapter.rb
 - lib/sidekiq-status/server_middleware.rb
 - lib/sidekiq-status/sidekiq_extensions.rb
 - lib/sidekiq-status/storage.rb
@@ -187,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: An extension to the sidekiq message processing to track your jobs

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-rvm:
-  - 2.6
-  - 2.7
-  - 3.0
-  - ruby-head
-gemfile:
-  - gemfiles/sidekiq_5.x.gemfile
-  - gemfiles/sidekiq_6.1.gemfile
-  - gemfiles/sidekiq_6.x.gemfile
-before_install:
-  - gem update --system
-  - gem update bundler
-services: redis
-notifications:
-  email: false
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head