gouda 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 760773cc030761badbc847c89278a501588ba47ff6106c8d4a3a71ae30aebaac
-  data.tar.gz: 5039b969fc5f258a898ab66c1f617d4bfdaa33bc29d69f285fd875e1e60617fe
+  metadata.gz: 194787c234288ffdeede62d80c4b4bb2fc32f9fc14dff756176ce1962ebacd99
+  data.tar.gz: 2c02e284e17e80640c279057c66afcbd34d40ccac3ab730a59572c21562c0430
 SHA512:
-  metadata.gz: c29cd1f3ea3ccba5b7995c3d32aed5c9a27d10b7609bee622edd7766ba2acee17a875b1a48f35e24d9bec42e7353f38451c35b79ae970994128ca2931a2e7ff1
-  data.tar.gz: 2c70d0d7a0a989c3d6e52ab87df3287831561a50e0ef766d4d18cf21939f06e47f19de48dd480ed2acffc340f727ad046a67e7cc6d6e37dfc3963f181f8742d8
+  metadata.gz: 52ded3cb575eedb5392d51cfe9a358d4a76792a65c3764bbf7ad091c5d17740cfdb7429278a8389abb15533ff97298810e954595c5d7621044e7d6bf2e728f60
+  data.tar.gz: 4df3f4ab5d53ef0acbf4c9be87500e6c64e2333444035de113337822894b7ab414b68970a6f6c4194c65a1042ab4f4f86276aec7b4ab48ea1a46b1c8ad67c56f

data/CHANGELOG.md

@@ -1,42 +1,50 @@
 ## [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] - 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

data/lib/gouda/version.rb

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

data/lib/gouda/workload.rb

@@ -45,7 +45,7 @@ class Gouda::Workload < ActiveRecord::Base
 
   def self.prune
     if Gouda.config.preserve_job_records
-      where(state: "finished").where("execution_finished_at < ?", Gouda.cleanup_preserved_jobs_before.ago).delete_all
+      where(state: "finished").where("execution_finished_at < ?", Gouda.config.cleanup_preserved_jobs_before.ago).delete_all
     else
       where(state: "finished").delete_all
     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.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Sebastian van Hesteren
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-21 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