gouda 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068482a6e09e7964085e1640542cff5ce00a8c536c20b1225f21e998b5ea1d26'
-  data.tar.gz: 279759ccb7b9f19c4563839ba6c21f1b2fb1366e066e3534ce85d2220facfc07
+  metadata.gz: 9b4b5340ec99f15fe7a62bc9a63642862219dc149d38d2e7e519f2ed655747e0
+  data.tar.gz: 817fe1a0ef4a2b107ad07ce28c3e627e79ffe3cf5fb1be06089165e07e432ec5
 SHA512:
-  metadata.gz: 6c88fea153e08fa57f0a63cc72e3cc708d83eb5a67fb06d99587fba07d56ced9082ceecf2892e59872d1c8d09e0ee0a3b0e0bb462768270cdb799b8dc998ab9a
-  data.tar.gz: c1fd707147f85b7a9769fb1889015299e881ebb94cd79317207fcb24512e0e72b64bf303c2eb69a5079be1035087f37dbe045166791adf805daa10a90a73ecf9
+  metadata.gz: 0aa57b5dedc0a7fe3126d965fe377ebb00dc8f407d7a01877886b57c2f35f45bd2c254d370949a65ec44f3704353b2741509ff099acc0c285aa752ab500805a1
+  data.tar.gz: 29f6d58da6179f0af817c541fdf9e0ca2fbf00fa83cab2d69c780a221761b26d08679a02419afbba93070d7d19babed436727a2cf994471fa94aabf7c359a7b8

data/CHANGELOG.md

@@ -1,46 +1,54 @@
 ## [Unreleased]
 
-## [0.1.0] - 2023-06-10
+## [0.1.0] - 2024-06-10
 
 - Initial release
 
-## [0.1.1] - 2023-06-10
+## [0.1.1] - 2024-06-10
 
 - Fix support for older ruby versions until 2.7
 
-## [0.1.2] - 2023-06-11
+## [0.1.2] - 2024-06-11
 
 - Updated readme and method renaming in Scheduler
 
-## [0.1.3] - 2023-06-11
+## [0.1.3] - 2024-06-11
 
 - Allow the Rails app to boot even if there is no database yet
 
-## [0.1.4] - 2023-06-14
+## [0.1.4] - 2024-06-14
 
 - Rescue NoDatabaseError at scheduler update.
 - Include tests in gem, for sake of easier debugging.
 - Reduce logging in local test runs.
 - Bump local ruby version to 3.3.3
 
-## [0.1.5] - 2023-06-18
+## [0.1.5] - 2024-06-18
 
 - Update documentation
 - Don't pass on scheduler keys to retries
 
-## [0.1.6] - 2023-06-18
+## [0.1.6] - 2024-06-18
 
 - Fix: don't upsert workloads twice when starting Gouda.
 - Add back in Appsignal calls
 
-## [0.1.7] - 2023-06-21
+## [0.1.7] - 2024-06-21
 
 - Separate all instrumentation to use ActiveSupport::Notification
 
-## [0.1.8] - 2023-06-21
+## [0.1.8] - 2024-06-21
 
 - Move some missed instrumentations to Gouda.instrument
 
-## [0.1.9] - 2023-06-26
+## [0.1.9] - 2024-06-26
 
 - Fix: cleanup_preserved_jobs_before in Gouda::Workload.prune now points to Gouda.config
+
+## [0.1.10] - 2024-07-03
+
+- Fix: remove logger overrides that Gouda should install, as this causes problems for Rails apps hosting Gouda
+
+## [0.1.11] - 2024-07-03
+
+- Fix: make sure the Gouda logger config does not get used during Rails initialization

data/lib/gouda/railtie.rb

@@ -43,14 +43,10 @@ module Gouda
           Gouda.config.preserve_job_records = config_from_rails[:preserve_job_records]
           Gouda.config.polling_sleep_interval_seconds = config_from_rails[:polling_sleep_interval_seconds]
           Gouda.config.worker_thread_count = config_from_rails[:worker_thread_count]
-          if Gouda.config.logger
-            Gouda.config.logger.level = config_from_rails[:log_level] || Gouda.config.log_level
-          end
         end
       else
         Gouda.config.preserve_job_records = false
         Gouda.config.polling_sleep_interval_seconds = 0.2
-        Gouda.config.logger.level = Gouda.config.log_level
       end
 
       Gouda::Scheduler.build_scheduler_entries_list!

data/lib/gouda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gouda
-  VERSION = "0.1.9"
+  VERSION = "0.1.11"
 end

data/lib/gouda.rb

@@ -24,19 +24,14 @@ module Gouda
     config_accessor(:cleanup_preserved_jobs_before, default: 3.hours)
     config_accessor(:polling_sleep_interval_seconds, default: 0.2)
     config_accessor(:worker_thread_count, default: 1)
-    config_accessor(:logger, default: ActiveSupport::Logger.new($stdout))
     config_accessor(:app_executor)
     config_accessor(:cron, default: {})
     config_accessor(:enable_cron, default: true)
-    # Log levels are:
-    # constant    |   level
-    # Logger::DEBUG   (0)
-    # Logger::INFO    (1)
-    # Logger::WARN    (2)
-    # Logger::ERROR   (3)
-    # Logger::FATAL   (4)
-    # Logger::UNKNOWN (5)
-    config_accessor(:log_level, default: Logger::DEBUG)
+    # Deprecated logger configuration. This needs to be available in the
+    # Configuration object because it might be used from the Rails app
+    # that is using Gouda. The config values will be ignored though.
+    config_accessor(:logger, default: nil)
+    config_accessor(:log_level, default: nil)
   end
 
   class InterruptError < StandardError
@@ -52,10 +47,10 @@ module Gouda
       Gouda::AnyQueue
     end
 
-    Gouda.logger.info("Gouda version: #{Gouda::VERSION}")
-    Gouda.logger.info("Worker threads: #{Gouda.config.worker_thread_count}")
+    logger.info("Gouda version: #{Gouda::VERSION}")
+    logger.info("Worker threads: #{Gouda.config.worker_thread_count}")
 
-    Gouda.worker_loop(n_threads: Gouda.config.worker_thread_count, queue_constraint: queue_constraint)
+    worker_loop(n_threads: Gouda.config.worker_thread_count, queue_constraint: queue_constraint)
   end
 
   def self.config
@@ -67,14 +62,29 @@ module Gouda
   end
 
   def self.logger
-    Gouda.config.logger
+    # By default, return a logger that sends data nowhere. The `Rails.logger` method
+    # only becomes available later in the Rails lifecycle.
+    @fallback_gouda_logger ||= begin
+      ActiveSupport::Logger.new($stdout).tap do |logger|
+        logger.level = Logger::WARN
+      end
+    end
+
+    # We want the Rails-configured loggers to take precedence over ours, since Gouda
+    # is just an ActiveJob adapter and the Workload is just an ActiveRecord, in the end.
+    # So it should be up to the developer of the app, not to us, to set the logger up
+    # and configure out. There are also gems such as "stackdriver" from Google which
+    # rather unceremonously overwrite the Rails logger with their own. If that happens,
+    # it is the choice of the user to do so - and we should honor that choice. Same for
+    # the logging level - the Rails logger level must take precendence. Same for logger
+    # broadcasts which get set up, for example, by the Rails console when you start it.
+    Rails.try(:logger) || ActiveJob::Base.try(:logger) || @fallback_gouda_logger
   end
 
   def self.instrument(channel, options, &block)
     ActiveSupport::Notifications.instrument("#{channel}.gouda", options, &block)
   end
 
-
   def self.create_tables(active_record_schema)
     active_record_schema.create_enum :gouda_workload_state, %w[enqueued executing finished]
     active_record_schema.create_table :gouda_workloads, id: :uuid do |t|

data/test/gouda/test_helper.rb

@@ -23,8 +23,7 @@ class ActiveSupport::TestCase
     @adapter || Gouda::Adapter.new
     @case_random = Random.new(Minitest.seed)
     Gouda::Railtie.initializers.each(&:run)
-    ActiveJob::Base.logger = nil
-    Gouda.config.logger.level = 4
+    Gouda.logger.level = Logger::WARN
   end
 
   teardown do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gouda
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Sebastian van Hesteren
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.13
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Job Scheduler