dial 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4f60345ab5528878505773aa1b5875d4e00164ac9e94968584a40ecbb18b251
-  data.tar.gz: 5d2d5399d37be584ed2dd17f39cd98ed45af05a66e2eb8609fd340ef54dbeeb9
+  metadata.gz: 6cd83bb50a207183202f0f0f9775d060446a352cf88382252fdfc00c4dbb4de6
+  data.tar.gz: a84109907f3884386ce2122ba5173c33ebc8da6e1c900bb94439389a274887b7
 SHA512:
-  metadata.gz: f78cf96c6482b571710c49363e00e7ffb5e65f8e07f180d9e5d99ce862af4d28c2032ff8757b565dc053699e0d4d044dfae26346de297b310c4324c659101216
-  data.tar.gz: 522ab5c9d3f3e556a71f440256a36d6f2bedc0abb5dccab05c147bc21a50332da581683188fcb1f672c58fc05773782d65fb575995d6adc0f0a856b9e78d6e8c
+  metadata.gz: b1e2a82ea64022c1dcf83f5fc5ae7cdfc3f53794552c9752f4d39f4f490bfcbc25bb3b1632b211ba08c4e4af7c1dd22483c037d06cf2b59dcda44b9d36c92bd7
+  data.tar.gz: 27075354578df3d541fdacb9704959c097a4cd2a128653b8e67b57424b64d934e5c50e1f335a33111012ba2f87b381048cde8ac4d12961dce86cea4059edf54d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.5.2] - 2025-10-04
+
+-  Preserve existing prosopite custom loggers
+
 ## [0.5.1] - 2025-09-27
 
 - Don't clean up stale storage data in railtie

data/lib/dial/prosopite.rb

@@ -2,8 +2,35 @@
 
 require "active_support/core_ext/string/filters"
 
+require_relative "prosopite_composite_logger"
+
 module Dial
   module Prosopite
+    def custom_logger= logger
+      return super logger if @setting_dial_logger
+
+      @original_logger = logger
+
+      if @dial_logger && @original_logger
+        super ProsopiteCompositeLogger.new @dial_logger, @original_logger
+      else
+        super logger
+      end
+    end
+
+    def dial_logger= logger
+      @dial_logger = logger
+
+      @setting_dial_logger = true
+      if @original_logger
+        self.custom_logger = ProsopiteCompositeLogger.new @dial_logger, @original_logger
+      else
+        self.custom_logger = @dial_logger
+      end
+    ensure
+      @setting_dial_logger = false
+    end
+
     def send_notifications
       tc[:prosopite_notifications] = tc[:prosopite_notifications].to_h do |queries, kaller|
         [queries.map { |query| query.squish }, kaller]

data/lib/dial/prosopite_composite_logger.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "logger"
+
+module Dial
+  class ProsopiteCompositeLogger
+    def initialize dial_logger, existing_logger = nil
+      @dial_logger = dial_logger
+      @existing_logger = existing_logger
+    end
+
+    def level
+      @dial_logger.level
+    end
+
+    def level= value
+      @dial_logger.level = value
+      @existing_logger.level = value if @existing_logger&.respond_to? :level=
+    end
+
+    def method_missing method, *args, &block
+      result = nil
+      result = @dial_logger.send method, *args, &block if @dial_logger.respond_to? method
+      @existing_logger.send method, *args, &block if @existing_logger&.respond_to? method
+      result
+    end
+
+    def respond_to_missing? method, include_private = false
+      @dial_logger.respond_to?(method, include_private) ||
+        @existing_logger&.respond_to?(method, include_private) ||
+          false
+    end
+  end
+end

data/lib/dial/railtie.rb

@@ -15,7 +15,7 @@ module Dial
         if ::ActiveRecord::Base.configurations.configurations.any? { |config| config.adapter == "postgresql" }
           require "pg_query"
         end
-        ::Prosopite.custom_logger = ProsopiteLogger.new
+        ::Prosopite.dial_logger = ProsopiteLogger.new
 
         # finalize configuration
         Dial._configuration.freeze

data/lib/dial/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dial
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dial
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Joshua Young
@@ -114,6 +114,7 @@ files:
 - lib/dial/middleware/rails_stat.rb
 - lib/dial/middleware/ruby_stat.rb
 - lib/dial/prosopite.rb
+- lib/dial/prosopite_composite_logger.rb
 - lib/dial/prosopite_logger.rb
 - lib/dial/railtie.rb
 - lib/dial/storage.rb