logster 2.6.2 → 2.9.0

data/client-app/package.json

@@ -19,30 +19,31 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^1.1.0",
+    "@fortawesome/ember-fontawesome": "^0.2.1",
+    "@fortawesome/free-brands-svg-icons": "^5.13.0",
+    "@fortawesome/free-regular-svg-icons": "^5.13.0",
+    "@fortawesome/free-solid-svg-icons": "^5.13.0",
     "@glimmer/component": "^1.0.0",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^1.5.3",
     "ember-cli": "^3.15.0",
     "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.13.0",
+    "ember-cli-babel": "^7.19.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars": "^4.2.0",
+    "ember-cli-htmlbars": "^4.3.1",
     "ember-cli-inject-live-reload": "^2.0.1",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-template-lint": "^1.0.0-beta.3",
+    "ember-cli-template-lint": "^1.0.0",
     "ember-cli-uglify": "^3.0.0",
-    "ember-data": "~3.15.0",
     "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^7.0.0",
-    "ember-font-awesome": "^4.0.0-rc.4",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^4.6.0",
     "ember-resolver": "^7.0.0",
     "ember-source": "^3.15.0",
-    "eslint-plugin-ember": "^7.7.1",
+    "eslint-plugin-ember": "^7.13.0",
     "eslint-plugin-node": "^10.0.0",
     "loader.js": "^4.7.0",
     "prettier": "^1.19.1",

data/client-app/tests/integration/components/back-trace-test.js

@@ -46,7 +46,7 @@ activerecord-6.0.1/lib/active_record/relation/finder_methods.rb:317:in \`exists?
 
     let gemLine = find("div.backtrace-line");
     assert.equal(
-      gemLine.textContent,
+      gemLine.textContent.trim(),
       "activerecord-6.0.1/lib/active_record/relation/finder_methods.rb:317:in `exists?'",
       "gem lines are truncated"
     );

data/client-app/tests/integration/components/env-tab-test.js

@@ -148,7 +148,7 @@ module("Integration | Component | env-tab", function(hooks) {
 
     assert.equal(
       defaultExpanded.children[1].textContent.trim(),
-      "[vvv1, vvv2]",
+      "vvv1, [vvv2]",
       "list is expanded by default when its length is 3 or less"
     );
 
@@ -165,7 +165,7 @@ module("Integration | Component | env-tab", function(hooks) {
     const expanded = find(".env-table tr");
     assert.equal(
       expanded.children[1].textContent.trim(),
-      "[value1, value2, value3, value4]",
+      "value1, [value2, value3, value4]",
       "expanded env keys shown correctly"
     );
 

data/lib/logster/base_store.rb

@@ -152,9 +152,11 @@ module Logster
       return if (!msg || (String === msg && msg.empty?)) && skip_empty
       return if level && severity < level
 
+      msg = msg.inspect unless String === msg
+      msg = truncate_message(msg)
       message = Logster::Message.new(severity, progname, msg, opts[:timestamp], count: opts[:count])
 
-      env = opts[:env] || {}
+      env = opts[:env]&.dup || {}
       backtrace = opts[:backtrace]
       if Hash === env && env[:backtrace]
         # Special - passing backtrace through env
@@ -245,6 +247,11 @@ module Logster
 
     private
 
+    def truncate_message(msg)
+      cap = Logster.config.maximum_message_length
+      msg.size <= cap ? msg : msg[0...cap] + "..."
+    end
+
     def not_implemented
       raise "Not Implemented"
     end

data/lib/logster/configuration.rb

@@ -17,7 +17,8 @@ module Logster
       :enable_backtrace_links,
       :gems_dir,
       :max_env_bytes,
-      :max_env_count_per_message
+      :max_env_count_per_message,
+      :maximum_message_length
     )
 
     attr_writer :subdirectory
@@ -37,6 +38,7 @@ module Logster
       @project_directories = []
       @enable_backtrace_links = true
       @gems_dir = Gem.dir + "/gems/"
+      @maximum_message_length = 2000
 
       @allow_grouping = false
 

data/lib/logster/message.rb

@@ -4,8 +4,6 @@ require 'digest/sha1'
 require 'securerandom'
 
 module Logster
-  MAX_MESSAGE_LENGTH = 600
-
   class Message
     LOGSTER_ENV = "_logster_env".freeze
     ALLOWED_ENV = %w{
@@ -30,7 +28,7 @@ module Logster
       @timestamp = timestamp || get_timestamp
       @severity = severity
       @progname = progname
-      @message = truncate_message(message)
+      @message = message
       @key = key || SecureRandom.hex
       @backtrace = nil
       @count = count || 1
@@ -57,10 +55,6 @@ module Logster
       h
     end
 
-    def message=(m)
-      @message = truncate_message(m)
-    end
-
     def to_json(opts = nil)
       exclude_env = Hash === opts && opts.delete(:exclude_env)
       JSON.fast_generate(to_h(exclude_env: exclude_env), opts)
@@ -143,10 +137,6 @@ module Logster
       end
     end
 
-    def is_similar?(other)
-      self.grouping_key == other.grouping_key
-    end
-
     def merge_similar_message(other)
       self.first_timestamp ||= self.timestamp
       self.timestamp = [self.timestamp, other.timestamp].max
@@ -311,14 +301,8 @@ module Logster
       end
     end
 
-    def truncate_message(msg)
-      return msg unless msg
-      msg = msg.inspect unless String === msg
-      msg.size <= MAX_MESSAGE_LENGTH ? msg : msg[0...MAX_MESSAGE_LENGTH] + "..."
-    end
-
     def get_timestamp
-      (Time.new.to_f * 1000).to_i
+      (Time.now.to_f * 1000).to_i
     end
   end
 end

data/lib/logster/middleware/reporter.rb

@@ -57,7 +57,14 @@ module Logster
         message << "\nWindow Location: " << params["window_location"] if params["window_location"]
 
         backtrace = params["stacktrace"] || ""
-        Logster.store.report(::Logger::Severity::WARN,
+
+        severity = ::Logger::Severity::WARN
+        if params["severity"] &&
+           ::Logger::Severity.const_defined?(params["severity"].upcase)
+          severity = ::Logger::Severity.const_get(params["severity"].upcase)
+        end
+
+        Logster.store.report(severity,
                             "javascript",
                             message,
                             backtrace: backtrace,

data/lib/logster/middleware/viewer.rb

@@ -48,7 +48,7 @@ module Logster
             end
 
             Logster.store.delete(message)
-            return [301, { "Location" => "#{@logs_path}/" }, []]
+            [301, { "Location" => "#{@logs_path}/" }, []]
 
           elsif resource =~ /\/(un)?protect\/([0-9a-f]+)$/
             off = $1 == "un"
@@ -61,15 +61,15 @@ module Logster
 
             if off
               if Logster.store.unprotect(key)
-                return [301, { "Location" => "#{@logs_path}/show/#{key}?protected=false" }, []]
+                [301, { "Location" => "#{@logs_path}/show/#{key}?protected=false" }, []]
               else
-                return [500, {}, ["Failed"]]
+                [500, {}, ["Failed"]]
               end
             else
               if Logster.store.protect(key)
-                return [301, { "Location" => "#{@logs_path}/show/#{key}?protected=true" }, []]
+                [301, { "Location" => "#{@logs_path}/show/#{key}?protected=true" }, []]
               else
-                return [500, {}, ["Failed"]]
+                [500, {}, ["Failed"]]
               end
             end
 
@@ -83,14 +83,14 @@ module Logster
 
             Logster.store.solve(key)
 
-            return [301, { "Location" => "#{@logs_path}" }, []]
+            [301, { "Location" => "#{@logs_path}" }, []]
 
           elsif resource =~ /\/clear$/
             if env[REQUEST_METHOD] != "POST"
               return method_not_allowed("POST")
             end
             Logster.store.clear
-            return [200, {}, ["Messages cleared"]]
+            [200, {}, ["Messages cleared"]]
 
           elsif resource =~ /\/show\/([0-9a-f]+)(\.json)?$/
             key = $1
@@ -179,7 +179,7 @@ module Logster
             end.first
             return not_found("No such pattern group exists") if !group
             group.messages_keys.each { |k| Logster.store.solve(k) }
-            return [200, {}, []]
+            [200, {}, []]
           elsif resource == '/development-preload.json' && ENV["LOGSTER_ENV"] == "development"
             [200, { "Content-Type" => "application/json; charset=utf-8" }, [JSON.generate(preloaded_data)]]
           else

data/lib/logster/redis_store.rb

@@ -249,11 +249,11 @@ module Logster
         envs = {}
         @redis.eval(
           BULK_ENV_GET_LUA,
-          keys: message_keys.map { |k| env_prefix(k) }
+          keys: message_keys.map { |k| env_prefix(k, with_namespace: true) }
         ).to_h.each do |k, v|
           next if v.size == 0
           parsed = v.size == 1 ? JSON.parse(v[0]) : v.map { |e| JSON.parse(e) }
-          envs[env_unprefix(k)] = parsed
+          envs[env_unprefix(k, with_namespace: true)] = parsed
         end
       end
       messages = @redis.hmget(hash_key, message_keys).map! do |json|
@@ -647,12 +647,28 @@ module Logster
       @redis.del(env_prefix(message_key))
     end
 
-    def env_unprefix(key)
-      key.sub(ENV_PREFIX, "")
+    def env_unprefix(key, with_namespace: false)
+      prefix = ENV_PREFIX
+      if with_namespace && namespace
+        prefix = "#{namespace}:#{prefix}"
+      end
+      key.sub(prefix, "")
+    end
+
+    def env_prefix(key, with_namespace: false)
+      prefix = ENV_PREFIX
+      if with_namespace && namespace
+        prefix = "#{namespace}:#{prefix}"
+      end
+      prefix + key
     end
 
-    def env_prefix(key)
-      ENV_PREFIX + key
+    def namespace
+      if @redis_prefix.respond_to?(:call)
+        @namespace ||= @redis_prefix.call
+      else
+        @namespace ||= @redis_prefix
+      end
     end
   end
 end

data/lib/logster/version.rb

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

data/logster.gemspec

@@ -8,7 +8,7 @@ require 'logster/version'
 Gem::Specification.new do |spec|
   spec.name          = "logster"
   spec.version       = Logster::VERSION
-  spec.authors       = ["UI for viewing logs in Rack"]
+  spec.authors       = ["Sam Saffron"]
   spec.email         = ["sam.saffron@gmail.com"]
   spec.summary       = %q{UI for viewing logs in Rack}
   spec.description   = %q{UI for viewing logs in Rack}
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.start_with?("bower_components") || f.start_with?("website") || f.start_with?("bin")
+    f.start_with?("website") || f.start_with?("bin")
   end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "timecop"
-  spec.add_development_dependency "byebug", "~> 11.0.0"
-  spec.add_development_dependency "rubocop", "~> 0.69.0"
-  spec.add_development_dependency "rubocop-discourse"
+  spec.add_development_dependency "byebug", "~> 11.1.0"
+  spec.add_development_dependency "rubocop-discourse", "~> 2.1.2"
 end

data/test/logster/middleware/test_reporter.rb

@@ -11,6 +11,7 @@ class TestReporter < Minitest::Test
     Logster.store = Logster::RedisStore.new
     Logster.store.clear_all
     Logster.config.enable_js_error_reporting = true
+    Logster.config.rate_limit_error_reporting = true
   end
 
   def test_logs_errors
@@ -22,6 +23,28 @@ class TestReporter < Minitest::Test
     assert_equal(1, Logster.store.count)
   end
 
+  def test_logs_severity_of_errors
+    Logster.config.rate_limit_error_reporting = false
+
+    reporter = Logster::Middleware::Reporter.new(nil)
+    env = Rack::MockRequest.env_for("/logs/report_js_error?message=hello")
+    status, = reporter.call(env)
+
+    assert_equal(Logger::Severity::WARN, Logster.store.latest[-1].severity)
+
+    reporter = Logster::Middleware::Reporter.new(nil)
+    env = Rack::MockRequest.env_for("/logs/report_js_error?message=hello&severity=invalid")
+    status, = reporter.call(env)
+
+    assert_equal(Logger::Severity::WARN, Logster.store.latest[-1].severity)
+
+    reporter = Logster::Middleware::Reporter.new(nil)
+    env = Rack::MockRequest.env_for("/logs/report_js_error?message=hello&severity=error")
+    status, = reporter.call(env)
+
+    assert_equal(Logger::Severity::ERROR, Logster.store.latest[-1].severity)
+  end
+
   def test_respects_ban_on_errors
     Logster.config.enable_js_error_reporting = false
 

data/test/logster/test_base_store.rb

@@ -162,4 +162,30 @@ class TestBaseStore < Minitest::Test
       assert_includes(message.backtrace.lines.first, __method__.to_s)
     end
   end
+
+  def test_log_message_is_truncated_when_above_maximum_message_length
+    orig = Logster.config.maximum_message_length
+    Logster.config.maximum_message_length = 300
+    msg = @store.report(Logger::WARN, '', 'a' * 400)
+    # 3 is the ... at the end to indicate truncated message
+    assert_equal(300 + 3, msg.message.size)
+
+    Logster.config.maximum_message_length = 100
+    msg = @store.report(Logger::WARN, '', 'a' * 200)
+    assert_equal(100 + 3, msg.message.size)
+  ensure
+    Logster.config.maximum_message_length = orig
+  end
+
+  def test_chained_loggers_shouldnt_mutate_env_passed_to_them
+    logger = Logster::Logger.new(@store)
+    other_store = Logster::TestStore.new
+    other_logger = Logster::Logger.new(other_store)
+    logger.chain(other_logger)
+    logger.add(Logger::WARN, "this is warning", '', { env: { backtrace: '11' } })
+    [@store, other_store].each do |store|
+      assert_equal('11', store.reported.first.backtrace)
+      refute_includes(store.reported.first.env.keys.map(&:to_sym), :backtrace)
+    end
+  end
 end

data/test/logster/test_group.rb

@@ -10,7 +10,7 @@ class TestGroup < MiniTest::Test
   end
 
   def test_from_json_works_correctly
-    time = (Time.new.to_f * 1000).to_i - 5000
+    time = (Time.now.to_f * 1000).to_i - 5000
     json = JSON.generate(
       key: '/somekey/',
       messages_keys: [111, 222, 333].map(&:to_s),

data/test/logster/test_message.rb

@@ -20,7 +20,7 @@ class TestMessage < MiniTest::Test
   end
 
   def test_populate_from_env_will_add_time_to_env_unless_it_already_exists
-    t = (Time.new.to_f * 1000).to_i
+    t = (Time.now.to_f * 1000).to_i
     msg = Logster::Message.new(0, '', 'test', t)
     msg.populate_from_env({})
     assert_equal(t, msg.env["time"])
@@ -146,12 +146,6 @@ class TestMessage < MiniTest::Test
     refute_includes(msg.to_json(exclude_env: true), test_hash.to_json)
   end
 
-  def test_title_is_truncated_when_too_large
-    msg = Logster::Message.new(0, "", "a" * 1000)
-    # 3 is the ... at the end to indicate truncated message
-    assert_equal(600 + 3, msg.message.size)
-  end
-
   def test_drop_redundant_envs
     message = Logster::Message.new(Logger::WARN, '', 'message')
     message.env = [{ a: 4 }] * 10

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.9.0
 platform: ruby
 authors:
-- UI for viewing logs in Rack
+- Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-09 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,42 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: 11.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: 11.1.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-discourse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.69.0
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.69.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-discourse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.2
 description: UI for viewing logs in Rack
 email:
 - sam.saffron@gmail.com
@@ -166,12 +152,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- assets/fonts/FontAwesome.otf
-- assets/fonts/fontawesome-webfont.eot
-- assets/fonts/fontawesome-webfont.svg
-- assets/fonts/fontawesome-webfont.ttf
-- assets/fonts/fontawesome-webfont.woff
-- assets/fonts/fontawesome-webfont.woff2
 - assets/images/Icon-144_rounded.png
 - assets/images/Icon-144_square.png
 - assets/images/icon_144x144.png
@@ -236,6 +216,7 @@ files:
 - client-app/app/templates/settings.hbs
 - client-app/app/templates/show.hbs
 - client-app/config/environment.js
+- client-app/config/icons.js
 - client-app/config/optional-features.json
 - client-app/config/targets.js
 - client-app/ember-cli-build.js
@@ -314,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: UI for viewing logs in Rack