judoscale-rails 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ef28716889b4e338730a6049886c7f19b37297ab52bc9d69babd089f8fd75d
-  data.tar.gz: 6595ce2909ee4950d1e49d14a3f79a2d813c1da1e6a947dedae9f89924d3f1f6
+  metadata.gz: b45823f4899741123f563c1ea56049225313237298bd13f02210dd169aa1df0d
+  data.tar.gz: dbff7158e5811fa111a607e75b8818bf234f745eb39854b4320606405450a5fe
 SHA512:
-  metadata.gz: d6eeae9d75a4d199293765b80da33ba20c1b795806bd7acb35bb75f4c9e3a0ebd3f4ca06ffbc417e52bb2d18be911e1b6731a184517cea5c9ae6d6257fffcf9d
-  data.tar.gz: 9edda70928cb495f76a3bb06ab9f748a0de9768359abe59b619e07c9c0c5ed387d21b8d6cb7fe5f5897b71b6402a0137270fa86a02acf11cd0461f6d62e04c8e
+  metadata.gz: 73223bb11efe2a1a9142b5b1587448cc98cde7b5297a304b920fe5a1a06bbbdfcad6ad2abc1beacc2b155d9d27897258e14956fb0796584853f05894feebd7f7
+  data.tar.gz: 97374d52f32048bde77017fc5070f510b77ffce5b428f38b2553e3c56304b155bf8403a9dbe05231ab73f355f653b768a0fccfce603c20c29127381fa2d906ec

data/lib/judoscale/rails/config.rb

@@ -0,0 +1,16 @@
+require "judoscale/config"
+
+module Judoscale
+  module Rails
+    module Config
+      attr_accessor :start_reporter_after_initialize
+
+      def reset
+        super
+        @start_reporter_after_initialize = true
+      end
+    end
+
+    ::Judoscale::Config.prepend Config
+  end
+end

data/lib/judoscale/rails/railtie.rb

@@ -3,7 +3,7 @@
 require "rails"
 require "rails/railtie"
 require "judoscale/request_middleware"
-require "judoscale/config"
+require "judoscale/rails/config"
 require "judoscale/logger"
 require "judoscale/reporter"
 
@@ -13,27 +13,36 @@ module Judoscale
       include Judoscale::Logger
 
       def in_rails_console?
-        defined?(::Rails::Console)
+        # This is gross, but we can't find a more reliable way to detect if we're in a Rails console.
+        caller.any? { |call| call.include?("console_command.rb") }
       end
 
-      def in_rake_task?
-        defined?(::Rake) && Rake.respond_to?(:application) && Rake.application.top_level_tasks.any?
+      def in_rake_task?(task_regex)
+        top_level_tasks = defined?(::Rake) && Rake.respond_to?(:application) && Rake.application.top_level_tasks || []
+        top_level_tasks.any? { |task| task_regex.match?(task) }
+      end
+
+      def judoscale_config
+        # Disambiguate from Judoscale::Rails::Config
+        ::Judoscale::Config.instance
       end
 
       initializer "Judoscale.logger" do |app|
-        Config.instance.logger = ::Rails.logger
+        judoscale_config.logger = ::Rails.logger
       end
 
       initializer "Judoscale.request_middleware" do |app|
-        if !in_rails_console? && !in_rake_task?
-          logger.debug "Preparing request middleware"
-          app.middleware.insert_before Rack::Runtime, RequestMiddleware
-        end
+        app.middleware.insert_before Rack::Runtime, RequestMiddleware
       end
 
       config.after_initialize do
-        # Don't suppress this in Rake tasks since some job adapters use Rake tasks to run jobs.
-        Reporter.start unless in_rails_console?
+        if in_rails_console?
+          logger.debug "No reporting since we're in a Rails console"
+        elsif in_rake_task?(/assets:|db:/)
+          logger.debug "No reporting since we're in a build process"
+        elsif judoscale_config.start_reporter_after_initialize
+          Reporter.start
+        end
       end
     end
   end

data/lib/judoscale/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Judoscale
   module Rails
-    VERSION = "1.5.2"
+    VERSION = "1.5.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Adam McCrea
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-10 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: judoscale-ruby
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -49,11 +49,11 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile-rails-6-1
-- Gemfile.lock
 - Rakefile
 - judoscale-rails.gemspec
 - lib/judoscale-rails.rb
 - lib/judoscale/rails.rb
+- lib/judoscale/rails/config.rb
 - lib/judoscale/rails/railtie.rb
 - lib/judoscale/rails/version.rb
 - lib/rails-autoscale-web.rb

data/Gemfile.lock

@@ -1,100 +0,0 @@
-PATH
-  remote: ../judoscale-ruby
-  specs:
-    judoscale-ruby (1.5.2)
-
-PATH
-  remote: .
-  specs:
-    judoscale-rails (1.5.2)
-      judoscale-ruby (= 1.5.2)
-      railties
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (7.0.7)
-      actionview (= 7.0.7)
-      activesupport (= 7.0.7)
-      rack (~> 2.0, >= 2.2.4)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.7)
-      activesupport (= 7.0.7)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    builder (3.2.4)
-    concurrent-ruby (1.2.2)
-    crass (1.0.6)
-    debug (1.7.1)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
-    erubi (1.12.0)
-    i18n (1.14.1)
-      concurrent-ruby (~> 1.0)
-    io-console (0.6.0)
-    irb (1.6.2)
-      reline (>= 0.3.0)
-    loofah (2.21.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    method_source (1.0.0)
-    minitest (5.17.0)
-    minitest-stub-const (0.6)
-    nokogiri (1.15.3-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-linux)
-      racc (~> 1.4)
-    racc (1.7.1)
-    rack (2.2.8)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.0.7)
-      actionpack (= 7.0.7)
-      activesupport (= 7.0.7)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
-    rake (13.0.6)
-    reline (0.3.2)
-      io-console (~> 0.5)
-    thor (1.2.2)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.11)
-
-PLATFORMS
-  arm64-darwin-20
-  arm64-darwin-21
-  arm64-darwin-22
-  x86_64-darwin-21
-  x86_64-linux
-
-DEPENDENCIES
-  debug
-  judoscale-rails!
-  judoscale-ruby!
-  minitest
-  minitest-stub-const
-  rake
-
-BUNDLED WITH
-   2.3.9