logster 2.12.2 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af6cad548aad16357be97a4dc20016c356bcf93536682586e59aa22ed2117a37
-  data.tar.gz: 0627ac8ba4a6ce06967c28cdca503f65f9c16dc14532ab59c1e1aac0ea1d2c49
+  metadata.gz: b69420ed949004c6a66f47104e4a0e7e2849038230ae775f8c60d3f5a38dd08d
+  data.tar.gz: feb7b7e9f010b4e817a85cea34f5b631219645f4865ff3dc693a845adbebd916
 SHA512:
-  metadata.gz: 8e64cbd0e84b5096f05f829dcea797a6cfeba93e811d8cadc3c1f7c7ac41f195a424f4b639c6b2d3983159c8e3e0b1d50f49cec127541b26e079c9646dbc481c
-  data.tar.gz: 37cec132177320ceeda68d95c81db38c33461dd10f9bd1985793e20c6006c7e3e71cdfd620e767181596407035e18b16da078b71fad1bfe300ab373270b3aa71
+  metadata.gz: 4c066d38fad5f96b100052151126c476e911d969f35805e8853fbb605ca2c31a9ddcc7049452f652a9b6b8ca073c45c0c71a9c45030d866d090d4c023f2f1243
+  data.tar.gz: 889cc20bb7e373ef89ee81b70d29d4bf0d8d7465c965be8250f26bc6111c8df5c83eb75e439e5ee4c254666a5cc7db849132849926ce84928f70bc5a67dff3d6

data/.github/workflows/ci.yml

@@ -92,6 +92,11 @@ jobs:
         working-directory: client-app
         run: yarn install
 
+      - name: Syntax Tree
+        if: ${{ !cancelled() }}
+        run: |
+            bundle exec stree check Gemfile $(git ls-files '*.rb') $(git ls-files '*.rake') $(git ls-files '*.thor')
+
       - name: JS linting
         if: ${{ !cancelled() }}
         working-directory: client-app

data/.streerc

@@ -0,0 +1,2 @@
+--print-width=100
+--plugins=plugin/trailing_comma

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+- 2023-10-03: 2.13.0
+
+  - FEATURE: Format messages with Logster::Logger#formatter before storing
+
 - 2023-03-10: 2.12.2
 
   - FIX: Don't throw on non-gem backtrace lines

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in rack-log-viewer.gemspec
 gemspec

data/assets/javascript/{chunk.143.f61340b825c6a3bf6dbe.js → chunk.143.91d07e8cdd5c4b9e4731.js}

@@ -1,6 +1,6 @@
 var __ember_auto_import__
-!function(){var e,r={654:function(e,r,n){var o,t
-e.exports=(o=_eai_d,t=_eai_r,window.emberAutoImportDynamic=function(e){return 1===arguments.length?t("_eai_dyn_"+e):t("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return t("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))},o("__v1-addons__early-boot-set__",[],(function(){})),void o("sinon",["__v1-addons__early-boot-set__"],(function(){return n(468)})))},338:function(e,r){window._eai_r=require,window._eai_d=define}},n={}
+!function(){var e,r={29:function(e,r,n){var o,t
+e.exports=(o=_eai_d,t=_eai_r,window.emberAutoImportDynamic=function(e){return 1===arguments.length?t("_eai_dyn_"+e):t("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return t("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))},o("__v1-addons__early-boot-set__",[],(function(){})),void o("sinon",["__v1-addons__early-boot-set__"],(function(){return n(468)})))},236:function(e,r){window._eai_r=require,window._eai_d=define}},n={}
 function o(e){var t=n[e]
 if(void 0!==t)return t.exports
 var i=n[e]={exports:{}}
@@ -17,6 +17,6 @@ var r=function(r,n){var t,i,u=n[0],_=n[1],a=n[2],f=0
 if(u.some((function(r){return 0!==e[r]}))){for(t in _)o.o(_,t)&&(o.m[t]=_[t])
 if(a)var c=a(o)}for(r&&r(n);f<u.length;f++)i=u[f],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0
 return o.O(c)},n=self.webpackChunk_ember_auto_import_=self.webpackChunk_ember_auto_import_||[]
-n.forEach(r.bind(null,0)),n.push=r.bind(null,n.push.bind(n))}(),o.O(void 0,[468],(function(){return o(338)}))
-var t=o.O(void 0,[468],(function(){return o(654)}))
+n.forEach(r.bind(null,0)),n.push=r.bind(null,n.push.bind(n))}(),o.O(void 0,[468],(function(){return o(236)}))
+var t=o.O(void 0,[468],(function(){return o(29)}))
 t=o.O(t),__ember_auto_import__=t}()

data/assets/javascript/{chunk.178.6d9ae01775c898e7b748.js → chunk.178.16d0c9057345120bdba1.js}

@@ -1,5 +1,5 @@
 var __ember_auto_import__
-!function(){var r,n={338:function(r,n){window._eai_r=require,window._eai_d=define},691:function(r,n,e){var t,o
+!function(){var r,n={236:function(r,n){window._eai_r=require,window._eai_d=define},531:function(r,n,e){var t,o
 r.exports=(t=_eai_d,o=_eai_r,window.emberAutoImportDynamic=function(r){return 1===arguments.length?o("_eai_dyn_"+r):o("_eai_dynt_"+r)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(r){return o("_eai_sync_"+r)(Array.prototype.slice.call(arguments,1))},t("__v1-addons__early-boot-set__",[],(function(){})),void t("qunit",["__v1-addons__early-boot-set__"],(function(){return e(916)})))}},e={}
 function t(r){var o=e[r]
 if(void 0!==o)return o.exports
@@ -17,6 +17,6 @@ var n=function(n,e){var o,i,_=e[0],u=e[1],a=e[2],c=0
 if(_.some((function(n){return 0!==r[n]}))){for(o in u)t.o(u,o)&&(t.m[o]=u[o])
 if(a)var f=a(t)}for(n&&n(e);c<_.length;c++)i=_[c],t.o(r,i)&&r[i]&&r[i][0](),r[i]=0
 return t.O(f)},e=self.webpackChunk_ember_auto_import_=self.webpackChunk_ember_auto_import_||[]
-e.forEach(n.bind(null,0)),e.push=n.bind(null,e.push.bind(e))}(),t.O(void 0,[916],(function(){return t(338)}))
-var o=t.O(void 0,[916],(function(){return t(691)}))
+e.forEach(n.bind(null,0)),e.push=n.bind(null,e.push.bind(e))}(),t.O(void 0,[916],(function(){return t(236)}))
+var o=t.O(void 0,[916],(function(){return t(531)}))
 o=t.O(o),__ember_auto_import__=o}()

data/assets/javascript/client-app.js

@@ -1281,4 +1281,4 @@ var r=(0,t.createTemplateFactory)({id:"qqSpoh9d",block:'[[[10,0],[14,0,"settings
 e.default=r})),define("client-app/templates/show",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 var r=(0,t.createTemplateFactory)({id:"Wi+UDSYU",block:'[[[8,[39,0],[[24,0,"recent-link"]],[["@route"],["index"]],[["default"],[[[[1,"Recent"]],[]]]]],[1,"\\n\\n"],[10,0],[14,1,"bottom-panel"],[14,0,"full"],[12],[1,"\\n  "],[8,[39,1],null,[["@currentMessage","@showTitle","@envChangedAction","@currentEnvPosition","@actionsInMenu"],[[30,0,["model"]],"true",[30,0,["envChanged"]],[30,0,["envPosition"]],false]],null],[1,"\\n"],[13]],[],false,["link-to","message-info"]]',moduleName:"client-app/templates/show.hbs",isStrictMode:!1})
 e.default=r})),define("client-app/config/environment",[],(function(){try{var e="client-app/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),r={default:JSON.parse(decodeURIComponent(t))}
-return Object.defineProperty(r,"__esModule",{value:!0}),r}catch(n){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("client-app/app").default.create({name:"client-app",version:"0.0.0+21ff151f"})
+return Object.defineProperty(r,"__esModule",{value:!0}),r}catch(n){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("client-app/app").default.create({name:"client-app",version:"0.0.0+1c8d3d18"})

data/client-app/package.json

@@ -58,7 +58,7 @@
     "qunit": "^2.17.2",
     "qunit-dom": "^2.0.0",
     "sinon": "^15.0.1",
-    "webpack": "^5.75.0"
+    "webpack": "^5.76.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

data/client-app/preload-json-manager.rb

@@ -3,13 +3,13 @@
 # This script takes care of updating the content of the preloaded json in tests/index.html
 # All you need to do is update the `tests_index_html` hash and run the script
 
-require 'bundler/inline'
-require 'json'
-require 'cgi'
+require "bundler/inline"
+require "json"
+require "cgi"
 
 gemfile do
-  source 'https://rubygems.org'
-  gem 'nokogiri'
+  source "https://rubygems.org"
+  gem "nokogiri"
 end
 
 tests_index_html = {
@@ -17,23 +17,16 @@ tests_index_html = {
   gems_dir: "/var/www/discourse/vendor/bundle/ruby/2.6.0/gems/",
   backtrace_links_enabled: true,
   gems_data: [
-    {
-      name: "activerecord",
-      url: "https://github.com/rails/rails/tree/v6.0.1/activerecord"
-    }
+    { name: "activerecord", url: "https://github.com/rails/rails/tree/v6.0.1/activerecord" },
   ],
   directories: [
-    {
-      path: "/var/www/discourse",
-      url: "https://github.com/discourse/discourse",
-      main_app: true
-    },
+    { path: "/var/www/discourse", url: "https://github.com/discourse/discourse", main_app: true },
     {
       path: "/var/www/discourse/plugins/discourse-prometheus",
-      url: "https://github.com/discourse/discourse-prometheus"
-    }
+      url: "https://github.com/discourse/discourse-prometheus",
+    },
   ],
-  application_version: "ce512452b512b909c38e9c63f2a0e1f8c17a2399"
+  application_version: "ce512452b512b909c38e9c63f2a0e1f8c17a2399",
 }
 
 content = File.read("tests/index.html")

data/client-app/yarn.lock

@@ -4275,9 +4275,9 @@ engine.io-parser@~5.0.3:
   integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==
 
 engine.io@~6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.1.tgz#8056b4526a88e779f9c280d820422d4e3eeaaae5"
-  integrity sha512-JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw==
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.2.tgz#ffeaf68f69b1364b0286badddf15ff633476473f"
+  integrity sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
@@ -8268,19 +8268,19 @@ schema-utils@^4.0.0:
     ajv-keywords "^5.0.0"
 
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -8478,9 +8478,9 @@ socket.io-adapter@~2.5.2:
     ws "~8.11.0"
 
 socket.io-parser@~4.2.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206"
-  integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.3.tgz#926bcc6658e2ae0883dc9dee69acbdc76e4e3667"
+  integrity sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==
   dependencies:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
@@ -9447,10 +9447,10 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.75.0:
-  version "5.75.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
-  integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
+webpack@^5.76.0:
+  version "5.76.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.0.tgz#f9fb9fb8c4a7dbdcd0d56a98e56b8a942ee2692c"
+  integrity sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
@@ -9554,9 +9554,9 @@ wide-align@^1.1.5:
     string-width "^1.0.2 || 2 || 3 || 4"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 wordwrap@^0.0.3:
   version "0.0.3"

data/lib/examples/sidekiq_logster_reporter.rb

@@ -4,19 +4,17 @@ class SidekiqLogsterReporter
   def call(ex, context = {})
     # Pass context to Logster
     fake_env = {}
-    context.each do |key, value|
-      Logster.add_to_env(fake_env, key, value)
-    end
+    context.each { |key, value| Logster.add_to_env(fake_env, key, value) }
 
     text = "Job exception: #{ex}\n"
-    if ex.backtrace
-      Logster.add_to_env(fake_env, :backtrace, ex.backtrace)
-    end
+    Logster.add_to_env(fake_env, :backtrace, ex.backtrace) if ex.backtrace
 
     Thread.current[Logster::Logger::LOGSTER_ENV] = fake_env
     Logster.logger.error(text)
   rescue => e
-    Logster.logger.fatal("Failed to log exception #{ex} #{hash}\nReason: #{e.class} #{e}\n#{e.backtrace.join("\n")}")
+    Logster.logger.fatal(
+      "Failed to log exception #{ex} #{hash}\nReason: #{e.class} #{e}\n#{e.backtrace.join("\n")}",
+    )
   ensure
     Thread.current[Logster::Logger::LOGSTER_ENV] = nil
   end

data/lib/logster/base_store.rb

@@ -2,7 +2,6 @@
 
 module Logster
   class BaseStore
-
     attr_accessor :level, :max_retention, :skip_empty, :ignore, :allow_custom_patterns
 
     def initialize
@@ -166,31 +165,35 @@ module Logster
       message.populate_from_env(env)
 
       if backtrace
-        if backtrace.respond_to? :join
-          backtrace = backtrace.join("\n")
-        end
+        backtrace = backtrace.join("\n") if backtrace.respond_to? :join
         message.backtrace = backtrace
       else
         message.backtrace = caller.join("\n")
       end
 
-      return if ignore && ignore.any? do |pattern|
-        if message =~ pattern
-          val = Regexp === pattern ? pattern.inspect : pattern.to_s
-          increment_ignore_count(val)
-          true
-        end
+      if ignore &&
+           ignore.any? { |pattern|
+             if message =~ pattern
+               val = Regexp === pattern ? pattern.inspect : pattern.to_s
+               increment_ignore_count(val)
+               true
+             end
+           }
+        return
       end
 
       if Logster.config.enable_custom_patterns_via_ui || allow_custom_patterns
-        custom_ignore = @patterns_cache.fetch(Logster::SuppressionPattern::CACHE_KEY) do
-          Logster::SuppressionPattern.find_all(store: self)
-        end
-        return if custom_ignore.any? do |pattern|
-          if message =~ pattern
-            increment_ignore_count(pattern.inspect)
-            true
+        custom_ignore =
+          @patterns_cache.fetch(Logster::SuppressionPattern::CACHE_KEY) do
+            Logster::SuppressionPattern.find_all(store: self)
           end
+        if custom_ignore.any? { |pattern|
+             if message =~ pattern
+               increment_ignore_count(pattern.inspect)
+               true
+             end
+           }
+          return
         end
       end
 
@@ -199,7 +202,7 @@ module Logster
       if Logster.config.allow_grouping
         message.apply_message_size_limit(
           Logster.config.maximum_message_size_bytes,
-          gems_dir: Logster.config.gems_dir
+          gems_dir: Logster.config.gems_dir,
         )
         key = self.similar_key(message)
         similar = get(key, load_env: false) if key
@@ -215,7 +218,7 @@ module Logster
       else
         message.apply_message_size_limit(
           Logster.config.maximum_message_size_bytes,
-          gems_dir: Logster.config.gems_dir
+          gems_dir: Logster.config.gems_dir,
         )
         saved = save(message)
         message
@@ -224,9 +227,10 @@ module Logster
       message = similar || message
 
       if (Logster.config.enable_custom_patterns_via_ui || allow_custom_patterns) && saved
-        grouping_patterns = @patterns_cache.fetch(Logster::GroupingPattern::CACHE_KEY) do
-          Logster::GroupingPattern.find_all(store: self)
-        end
+        grouping_patterns =
+          @patterns_cache.fetch(Logster::GroupingPattern::CACHE_KEY) do
+            Logster::GroupingPattern.find_all(store: self)
+          end
 
         grouping_patterns.each do |pattern|
           if message =~ pattern

data/lib/logster/cache.rb

@@ -8,7 +8,8 @@ module Logster
     end
 
     def fetch(key)
-      if !@hash.key?(key) || @hash[key][:created_at] + @age < Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      if !@hash.key?(key) ||
+           @hash[key][:created_at] + @age < Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @hash[key] = { data: yield, created_at: Process.clock_gettime(Process::CLOCK_MONOTONIC) }
       end
       @hash[key][:data]

data/lib/logster/configuration.rb

@@ -19,7 +19,7 @@ module Logster
       :max_env_bytes,
       :max_env_count_per_message,
       :maximum_message_length,
-      :use_full_hostname
+      :use_full_hostname,
     )
 
     attr_writer :subdirectory
@@ -27,7 +27,7 @@ module Logster
     def initialize
       # lambda |env,block|
       @current_context = lambda { |_, &block| block.call }
-      @environments = [:development, :production]
+      @environments = %i[development production]
       @subdirectory = nil
       @env_expandable_keys = []
       @enable_custom_patterns_via_ui = false
@@ -50,7 +50,7 @@ module Logster
     end
 
     def subdirectory
-      @subdirectory || '/logs'
+      @subdirectory || "/logs"
     end
   end
 end

data/lib/logster/defer_logger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'logster/scheduler'
+require "logster/scheduler"
 
 module Logster
   class DeferLogger < ::Logster::Logger
@@ -8,9 +8,7 @@ module Logster
 
     def report_to_store(severity, progname, message, opts = {})
       opts[:backtrace] ||= caller.join("\n")
-      Logster::Scheduler.schedule do
-        super(severity, progname, message, opts)
-      end
+      Logster::Scheduler.schedule { super(severity, progname, message, opts) }
     end
   end
 end

data/lib/logster/group.rb

@@ -17,12 +17,13 @@ module Logster
 
     def self.from_json(json)
       hash = JSON.parse(json)
-      group = new(
-        hash["key"],
-        hash["messages_keys"],
-        timestamp: hash["timestamp"] || 0,
-        count: hash["count"] || 0
-      )
+      group =
+        new(
+          hash["key"],
+          hash["messages_keys"],
+          timestamp: hash["timestamp"] || 0,
+          count: hash["count"] || 0,
+        )
       group.changed = false
       group
     end
@@ -32,12 +33,7 @@ module Logster
     end
 
     def to_h
-      {
-        key: @key,
-        messages_keys: @messages_keys,
-        timestamp: @timestamp,
-        count: @count
-      }
+      { key: @key, messages_keys: @messages_keys, timestamp: @timestamp, count: @count }
     end
 
     def to_h_web
@@ -47,7 +43,7 @@ module Logster
         timestamp: @timestamp,
         messages: @messages,
         severity: -1,
-        group: true
+        group: true,
       }
     end
 
@@ -111,14 +107,15 @@ module Logster
       self.class.max_size
     end
 
-    GroupWeb = Struct.new(*%i[regex count timestamp messages row_id]) do
-      def to_json(opts = nil)
-        JSON.fast_generate(self.to_h.merge(severity: -1, group: true), opts)
-      end
+    GroupWeb =
+      Struct.new(*%i[regex count timestamp messages row_id]) do
+        def to_json(opts = nil)
+          JSON.fast_generate(self.to_h.merge(severity: -1, group: true), opts)
+        end
 
-      def key
-        self.regex # alias for testing convenience
+        def key
+          self.regex # alias for testing convenience
+        end
       end
-    end
   end
 end

data/lib/logster/ignore_pattern.rb

@@ -2,7 +2,6 @@
 
 module Logster
   class IgnorePattern
-
     def initialize(message_pattern = nil, env_patterns = nil)
       @msg_match = message_pattern
       @env_match = env_patterns
@@ -44,7 +43,7 @@ module Logster
         else
           false
         end
-        else
+      else
         false
       end
     end

data/lib/logster/logger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'logger'
+require "logger"
 
 module Logster
   class Logger < ::Logger
@@ -41,9 +41,7 @@ module Logster
         logger.add(severity, message, progname, &block)
       end
     ensure
-      if logger.respond_to? :skip_store
-        logger.skip_store = old
-      end
+      logger.skip_store = old if logger.respond_to? :skip_store
     end
 
     def add(*args, &block)
@@ -55,15 +53,11 @@ module Logster
     end
 
     def add_with_opts(severity, message = nil, progname = progname(), opts = nil, &block)
-      if severity < level
-        return true
-      end
+      return true if severity < level
 
       # it is not fun losing messages cause encoding is bad
       # protect all messages by scrubbing if needed
-      if message && !message.valid_encoding?
-        message = message.scrub
-      end
+      message = message.scrub if message && !message.valid_encoding?
 
       # we want to get the backtrace as early as possible so that logster's
       # own methods don't show up as the first few frames in the backtrace
@@ -73,9 +67,7 @@ module Logster
         backtrace ||= progname.backtrace if progname.kind_of?(::Exception)
         if !backtrace
           backtrace = caller_locations
-          while backtrace.first.path.end_with?("/logger.rb")
-            backtrace.shift
-          end
+          backtrace.shift while backtrace.first.path.end_with?("/logger.rb")
         end
         backtrace = backtrace.join("\n")
         opts[:backtrace] = backtrace
@@ -90,12 +82,18 @@ module Logster
             add_to_chained(@chained[i], severity, message, progname, opts, &block)
           rescue => e
             # don't blow up if STDERR is somehow closed
-            STDERR.puts "Failed to report message to chained logger #{e}" rescue nil
+            begin
+              STDERR.puts "Failed to report message to chained logger #{e}"
+            rescue StandardError
+              nil
+            end
           end
           i += 1
         end
       end
 
+      return if @skip_store
+
       progname ||= @progname
       if message.nil?
         if block_given?
@@ -106,7 +104,7 @@ module Logster
         end
       end
 
-      return if @skip_store
+      message = formatter.call(severity, Time.now, progname, message) if formatter
 
       opts ||= {}
       opts[:env] ||= Thread.current[LOGSTER_ENV]
@@ -114,7 +112,11 @@ module Logster
       report_to_store(severity, progname, message, opts)
     rescue => e
       # don't blow up if STDERR is somehow closed
-      STDERR.puts "Failed to report error: #{e} #{severity} #{message} #{progname}" rescue nil
+      begin
+        STDERR.puts "Failed to report error: #{e} #{severity} #{message} #{progname}"
+      rescue StandardError
+        nil
+      end
     end
 
     private