formatting, ensure environment is updated in Sidekiq.options

lib/sidekiq/cli.rb

@@ -13,14 +13,14 @@
 require "sidekiq/launcher"
 
 # module ScoutApm
-  # VERSION = "5.3.1"
+# VERSION = "5.3.1"
 # end
 fail <<~EOM if defined?(ScoutApm::VERSION) && ScoutApm::VERSION < "5.2.0"
-
-
-scout_apm v#{ScoutApm::VERSION} is unsafe with Sidekiq 6.5. Please run `bundle up scout_apm` to upgrade to 5.2.0 or greater.
-
-
+  
+  
+  scout_apm v#{ScoutApm::VERSION} is unsafe with Sidekiq 6.5. Please run `bundle up scout_apm` to upgrade to 5.2.0 or greater.
+  
+  
 EOM
 
 module Sidekiq # :nodoc:
@@ -225,6 +225,7 @@ def set_environment(cli_env)
       # Both Sinatra 2.0+ and Sidekiq support this term.
       # RAILS_ENV and RACK_ENV are there for legacy support.
       @environment = cli_env || ENV["APP_ENV"] || ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+      config[:environment] = @environment
     end
 
     def symbolize_keys_deep!(hash)

lib/sidekiq/client.rb

@@ -176,7 +176,7 @@ def enqueue_to(queue, klass, *args)
       def enqueue_to_in(queue, interval, klass, *args)
         int = interval.to_f
         now = Time.now.to_f
-        ts = (int < 1_000_000_000 ? now + int : int)
+        ts = ((int < 1_000_000_000) ? now + int : int)
 
         item = {"class" => klass, "args" => args, "at" => ts, "queue" => queue}
         item.delete("at") if ts <= now

lib/sidekiq/metrics/query.rb

@@ -123,7 +123,7 @@ def total_avg(metric = "ms")
         def series_avg(metric = "ms")
           series[metric].each_with_object(Hash.new(0)) do |(bucket, value), result|
             completed = series.dig("p", bucket) - series.dig("f", bucket)
-            result[bucket] = completed == 0 ? 0 : value.to_f / completed
+            result[bucket] = (completed == 0) ? 0 : value.to_f / completed
           end
         end
       end

lib/sidekiq/monitor.rb

@@ -101,7 +101,7 @@ def tags_for(process)
       tags = [
         process["tag"],
         process["labels"],
-        (process["quiet"] == "true" ? "quiet" : nil)
+        ((process["quiet"] == "true") ? "quiet" : nil)
       ].flatten.compact
       tags.any? ? "[#{tags.join("] [")}]" : nil
     end

lib/sidekiq/paginator.rb

@@ -3,7 +3,7 @@
 module Sidekiq
   module Paginator
     def page(key, pageidx = 1, page_size = 25, opts = nil)
-      current_page = pageidx.to_i < 1 ? 1 : pageidx.to_i
+      current_page = (pageidx.to_i < 1) ? 1 : pageidx.to_i
       pageidx = current_page - 1
       total_size = 0
       items = []
@@ -45,7 +45,7 @@ def page(key, pageidx = 1, page_size = 25, opts = nil)
     end
 
     def page_items(items, pageidx = 1, page_size = 25)
-      current_page = pageidx.to_i < 1 ? 1 : pageidx.to_i
+      current_page = (pageidx.to_i < 1) ? 1 : pageidx.to_i
       pageidx = current_page - 1
       starting = pageidx * page_size
       items = items.to_a

lib/sidekiq/web/helpers.rb

@@ -137,7 +137,7 @@ def t(msg, options = {})
     end
 
     def sort_direction_label
-      params[:direction] == "asc" ? "↑" : "↓"
+      (params[:direction] == "asc") ? "↑" : "↓"
     end
 
     def workset
@@ -188,7 +188,7 @@ def current_path
     end
 
     def current_status
-      workset.size == 0 ? "idle" : "active"
+      (workset.size == 0) ? "idle" : "active"
     end
 
     def relative_time(time)
@@ -221,7 +221,7 @@ def to_query_string(params)
     end
 
     def truncate(text, truncate_after_chars = 2000)
-      truncate_after_chars && text.size > truncate_after_chars ? "#{text[0..truncate_after_chars]}..." : text
+      (truncate_after_chars && text.size > truncate_after_chars) ? "#{text[0..truncate_after_chars]}..." : text
     end
 
     def display_args(args, truncate_after_chars = 2000)

lib/sidekiq/worker.rb

@@ -257,7 +257,7 @@ def perform_in(interval, *args)
       def at(interval)
         int = interval.to_f
         now = Time.now.to_f
-        ts = (int < 1_000_000_000 ? now + int : int)
+        ts = ((int < 1_000_000_000) ? now + int : int)
         # Optimization to enqueue something now that is scheduled to go out now or in the past
         @opts["at"] = ts if ts > now
         self
@@ -324,7 +324,7 @@ def perform_bulk(*args, **kwargs)
       def perform_in(interval, *args)
         int = interval.to_f
         now = Time.now.to_f
-        ts = (int < 1_000_000_000 ? now + int : int)
+        ts = ((int < 1_000_000_000) ? now + int : int)
 
         item = {"class" => self, "args" => args}
 

test/test_cli.rb

@@ -6,6 +6,7 @@
 describe Sidekiq::CLI do
   describe "#parse" do
     before do
+      ENV["RAILS_ENV"] = ENV["RACK_ENV"] = nil
       Sidekiq.reset!
       @logger = Sidekiq.logger
       @logdev = StringIO.new
@@ -168,12 +169,12 @@ def logdev
 
         describe "config file" do
           it "accepts with -C" do
-            subject.parse(%w[sidekiq -C ./test/config.yml])
+            subject.parse(%w[sidekiq -C ./test/config.yml -e production])
 
             assert_equal "./test/config.yml", config[:config_file]
             refute config[:verbose]
             assert_equal "./test/fake_env.rb", config[:require]
-            assert_nil config[:environment]
+            assert_equal "production", config[:environment]
             assert_equal 50, config[:concurrency]
             assert_equal 2, config[:queues].count { |q| q == "very_often" }
             assert_equal 1, config[:queues].count { |q| q == "seldom" }
@@ -185,7 +186,7 @@ def logdev
             assert_equal "./test/config_string.yml", config[:config_file]
             refute config[:verbose]
             assert_equal "./test/fake_env.rb", config[:require]
-            assert_nil config[:environment]
+            assert_equal "development", config[:environment]
             assert_equal 50, config[:concurrency]
             assert_equal 2, config[:queues].count { |q| q == "very_often" }
             assert_equal 1, config[:queues].count { |q| q == "seldom" }

test/test_client.rb

@@ -54,7 +54,7 @@
     it "allows middleware to stop bulk jobs" do
       mware = Class.new do
         def call(worker_klass, msg, q, r)
-          msg["args"][0] == 1 ? yield : false
+          (msg["args"][0] == 1) ? yield : false
         end
       end
       client = Sidekiq::Client.new

test/test_processor.rb

@@ -294,8 +294,6 @@ def call(worker, item, queue, redis_pool)
     class CustomJobLogger < Sidekiq::JobLogger
       def call(item, queue)
         yield
-      rescue Exception
-        raise
       end
     end
 

test/test_retry.rb

@@ -107,7 +107,7 @@ def job
       max_retries = 7
       1.upto(max_retries + 1) do |i|
         assert_raises RuntimeError do
-          job = i > 1 ? jobstr("retry_count" => i - 2) : jobstr
+          job = (i > 1) ? jobstr("retry_count" => i - 2) : jobstr
           @config[:max_retries] = max_retries
           handler.local(worker, job, "default") do
             raise "kerblammo!"

test/test_web_helpers.rb

@@ -32,8 +32,7 @@ def env
     end
 
     def default
-      {
-      }
+      {}
     end
   end