logster 2.19.1 → 2.20.1

data/gemfiles/rails_6.1.gemfile

@@ -4,6 +4,9 @@ source "https://rubygems.org"
 
 group :test do
   gem "rails", "~> 6.1.0"
+  gem "concurrent-ruby", "1.3.4"
+  gem "mutex_m"
+  gem "bigdecimal"
 end
 
 gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -4,6 +4,9 @@ source "https://rubygems.org"
 
 group :test do
   gem "rails", "~> 7.0.0"
+  gem "concurrent-ruby", "1.3.4"
+  gem "mutex_m"
+  gem "bigdecimal"
 end
 
 gemspec path: "../"

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+group :test do
+  gem "rails", "~> 7.2.0"
+end
+
+gemspec path: "../"

data/lib/logster/group.rb

@@ -94,7 +94,6 @@ module Logster
         @timestamp = 0
         @changed = true
       end
-      @messages
     end
 
     def changed?

data/lib/logster/logger.rb

@@ -13,6 +13,7 @@ module Logster
       super(nil)
       @store = store
       @chained = []
+      @subscribers = []
       @skip_store = false
       @logster_override_level_key = "logster_override_level_#{object_id}"
     end
@@ -29,6 +30,17 @@ module Logster
       @chained << logger
     end
 
+    ##
+    # Subscribe to log events.
+    #
+    # Example:
+    #   logger.subscribe do |severity, message, progname, opts, &block|
+    #     YourCustomLogger.log(severity, message, progname, opts, &block)
+    #   end
+    def subscribe(&block)
+      @subscribers << block
+    end
+
     def add_to_chained(logger, severity, message, progname, opts = nil, &block)
       if logger.respond_to? :skip_store
         old = logger.skip_store
@@ -73,24 +85,8 @@ module Logster
         opts[:backtrace] = backtrace
       end
 
-      if @chained
-        i = 0
-        # micro optimise for logging
-        while i < @chained.length
-          # TODO double yielding blocks
-          begin
-            add_to_chained(@chained[i], severity, message, progname, opts, &block)
-          rescue => e
-            # don't blow up if STDERR is somehow closed
-            begin
-              STDERR.puts "Failed to report message to chained logger #{e}"
-            rescue StandardError
-              nil
-            end
-          end
-          i += 1
-        end
-      end
+      notify_subscribers(severity, message, progname, opts, &block)
+      add_to_chained_loggers(severity, message, progname, opts, &block)
 
       return if @skip_store
 
@@ -121,6 +117,52 @@ module Logster
 
     private
 
+    def add_to_chained_loggers(severity, message, progname, opts, &block)
+      chained_length = @chained.length
+
+      if chained_length > 0
+        i = 0
+        # micro optimise for logging since while loop is almost twice as fast
+        while i < chained_length
+          begin
+            add_to_chained(@chained[i], severity, message, progname, opts, &block)
+          rescue => e
+            # don't blow up if STDERR is somehow closed
+            begin
+              STDERR.puts "Failed to report message to chained logger: #{e.class} (#{e.message})\n#{e.backtrace.join("\n")}"
+            rescue StandardError
+              nil
+            end
+          end
+          i += 1
+        end
+      end
+    end
+
+    def notify_subscribers(severity, message, progname, opts, &block)
+      subscribers_length = @subscribers.length
+
+      if subscribers_length > 0
+        i = 0
+
+        # micro optimise for logging since while loop is almost twice as fast
+        while i < subscribers_length
+          begin
+            @subscribers[i].call(severity, message, progname, opts, &block)
+          rescue => e
+            # don't blow up if STDERR is somehow closed
+            begin
+              STDERR.puts "Failed to report message to subscriber: #{e.class} (#{e.message})\n#{e.backtrace.join("\n")}"
+            rescue StandardError
+              nil
+            end
+          end
+
+          i += 1
+        end
+      end
+    end
+
     def report_to_store(severity, progname, message, opts = {})
       @store.report(severity, progname, message, opts)
     end

data/lib/logster/message.rb

@@ -182,7 +182,7 @@ module Logster
 
     def self.populate_env_helper(env)
       env[LOGSTER_ENV] ||= begin
-        unless env.include? "rack.input"
+        if !env.include? "rack.input"
           # Not a web request
           return env
         end

data/lib/logster/rails/railtie.rb

@@ -7,7 +7,7 @@ module Logster::Rails
 
   class << self
     def set_logger(config)
-      return unless Logster.config.environments.include?(Rails.env.to_sym)
+      return if !Logster.config.environments.include?(Rails.env.to_sym)
 
       require "logster/middleware/debug_exceptions"
       require "logster/middleware/reporter"
@@ -35,7 +35,7 @@ module Logster::Rails
     end
 
     def initialize!(app)
-      return unless Logster.config.environments.include?(Rails.env.to_sym)
+      return if !Logster.config.environments.include?(Rails.env.to_sym)
       return unless logster_enabled?
 
       if Logster.config.enable_js_error_reporting

data/lib/logster/redis_rate_limiter.rb

@@ -34,7 +34,7 @@ module Logster
     end
 
     def check(severity)
-      return unless @severities.include?(severity)
+      return if !@severities.include?(severity)
       time = Time.now.to_i
       num = bucket_number(time)
       redis_key = "#{key}:#{num}"

data/lib/logster/redis_store.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require "json"
-require "set"
+# Disable rubocop because the require is only redundant for Ruby 3.2+ but we still support Ruby 3.1
+require "set" # rubocop:disable Lint/RedundantRequireStatement
 require "logster/base_store"
 require "logster/redis_rate_limiter"
 
@@ -409,12 +410,12 @@ module Logster
       if @redis.llen(list_key) > max_backlog
         removed_keys = []
         while removed_key = @redis.lpop(list_key)
-          unless @redis.sismember(protected_key, removed_key)
+          if @redis.sismember(protected_key, removed_key)
+            removed_keys << removed_key
+          else
             rmsg = get(removed_key, load_env: false)
             delete(rmsg)
             break
-          else
-            removed_keys << removed_key
           end
         end
         removed_keys.reverse.each { |key| @redis.lpush(list_key, key) }
@@ -533,7 +534,7 @@ module Logster
           when Regexp
             value.to_s =~ search
           when String
-            value.to_s =~ Regexp.new(search, Regexp::IGNORECASE)
+            value.to_s =~ Regexp.new(Regexp.escape(search), Regexp::IGNORECASE)
           else
             false
           end

data/lib/logster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Logster
-  VERSION = "2.19.1"
+  VERSION = "2.20.1"
 end

data/logster.gemspec

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$LOAD_PATH.unshift(lib) if !$LOAD_PATH.include?(lib)
 require "logster/version"
 
 Gem::Specification.new do |spec|
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "byebug", "~> 11.1.0"
-  spec.add_development_dependency "rubocop-discourse", "~> 2.4.1"
+  spec.add_development_dependency "rubocop-discourse"
   spec.add_development_dependency "syntax_tree"
   spec.add_development_dependency "sqlite3"
 end

data/test/logster/middleware/test_viewer.rb

@@ -317,7 +317,7 @@ class TestViewer < Minitest::Test
     %w[/logsie/javascript/client-app.js /logsie/javascript/vendor.js].each do |path|
       response = request.get(path)
       assert_equal(200, response.status)
-      assert_equal("application/javascript", response.headers["content-type"])
+      assert %w[text/javascript application/javascript].include?(response.headers["content-type"])
     end
   end
 

data/test/logster/test_logger.rb

@@ -71,6 +71,46 @@ class TestLogger < Minitest::Test
     assert_equal "test", @store.calls.first[2]
   end
 
+  def test_subscribing_to_logger_events
+    custom_logger_klass =
+      Class.new do
+        attr_reader :events
+
+        def initialize
+          @events = []
+        end
+
+        def log(severity, message, progname, opts, &block)
+          @events.push({ severity:, message:, progname:, opts:, block: })
+        end
+      end
+
+    custom_logger = custom_logger_klass.new
+
+    @logger.subscribe do |severity, message, progname, opts, &block|
+      custom_logger.log(severity, message, progname, opts, &block)
+    end
+
+    @logger.add(0, "test", "prog", backtrace: "backtrace", env: { a: "x" })
+    @logger.add(1, nil, nil, backtrace: "backtrace") { "yielded message" }
+
+    first_event = custom_logger.events[0]
+
+    assert_equal(0, first_event[:severity])
+    assert_equal("test", first_event[:message])
+    assert_equal("prog", first_event[:progname])
+    assert_equal({ backtrace: "backtrace", env: { a: "x" } }, first_event[:opts])
+    assert_nil first_event[:block]
+
+    second_event = custom_logger.events[1]
+
+    assert_equal(1, second_event[:severity])
+    assert_nil second_event[:message]
+    assert_nil second_event[:progname]
+    assert_equal({ backtrace: "backtrace", env: nil }, second_event[:opts])
+    assert_equal("yielded message", second_event[:block].call)
+  end
+
   class NewLogger < Logster::Logger
   end
 

data/test/logster/test_redis_store.rb

@@ -428,6 +428,16 @@ class TestRedisStore < Minitest::Test
     assert_equal("TUVWXYZ", latest[0].message)
   end
 
+  def test_search_works_with_invalid_regex_chars
+    @store.report(Logger::INFO, "test", "ABCDEFG\\")
+    @store.report(Logger::INFO, "test", "TUVWXYZ")
+
+    result = @store.latest(search: "EFG\\")
+
+    assert_equal(1, result.size)
+    assert_equal("ABCDEFG\\", result[0].message)
+  end
+
   def test_search_exclude_results
     @store.report(Logger::INFO, "test", "ABCDEFG")
     @store.report(Logger::INFO, "test", "TUVWXYZ")
@@ -749,7 +759,9 @@ class TestRedisStore < Minitest::Test
       Rack::MockRequest.env_for("/test").merge(
         "HTTP_HOST" => "www.site.com",
         "HTTP_USER_AGENT" => "SOME WHERE",
+        "rack.input" => StringIO.new("test"),
       )
+
     orig = env.dup
     orig["test"] = "tests"
     orig["test1"] = "tests1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.20.1
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2025-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,16 +126,16 @@ dependencies:
   name: rubocop-discourse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: syntax_tree
   requirement: !ruby/object:Gem::Requirement
@@ -186,10 +186,10 @@ files:
 - assets/images/icon_144x144.png
 - assets/images/icon_64x64.png
 - assets/javascript/.gitkeep
-- assets/javascript/chunk.143.86f7820bfe6482b8dcd5.js
-- assets/javascript/chunk.178.c5fac0c2a2035839a91e.js
-- assets/javascript/chunk.468.95dd450003497c781cb3.js
-- assets/javascript/chunk.916.85a3fc9d873df80f5ea5.js
+- assets/javascript/chunk.524.c3042190e39d148beaf9.js
+- assets/javascript/chunk.582.695dcbfb11a784b110cd.js
+- assets/javascript/chunk.747.a730c497582bb6742a6e.js
+- assets/javascript/chunk.761.64949d89942c829e5c1b.js
 - assets/javascript/client-app.js
 - assets/javascript/vendor.js
 - assets/stylesheets/.gitkeep
@@ -280,6 +280,7 @@ files:
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
 - lib/examples/sidekiq_logster_reporter.rb
 - lib/logster.rb
 - lib/logster/base_store.rb