logster 2.8.0 → 2.9.4

data/client-app/package.json

@@ -24,18 +24,18 @@
     "@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-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
@@ -43,7 +43,7 @@
     "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/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/message.rb

@@ -113,7 +113,8 @@ module Logster
 
     # in its own method so it can be overridden
     def grouping_hash
-      { message: self.message, severity: self.severity, backtrace: self.backtrace }
+      message = self.message.gsub(/[0-9a-f]+/i, "X")
+      { message: message, severity: self.severity, backtrace: self.backtrace }
     end
 
     # todo - memoize?
@@ -137,10 +138,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
@@ -306,7 +303,7 @@ module Logster
     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/debug_exceptions.rb

@@ -14,13 +14,11 @@ class Logster::Middleware::DebugExceptions < ActionDispatch::DebugExceptions
     exception = wrapper.exception
 
     Logster.config.current_context.call(env) do
-      location = exception.backtrace[0]
-
       Logster.logger.add_with_opts(
         ::Logger::Severity::FATAL,
-        "#{exception.class} (#{exception})\n#{location}",
+        "#{exception.class} (#{exception})\n#{wrapper.application_trace.join("\n")}",
         "web-exception",
-        backtrace: exception.backtrace.join("\n"),
+        backtrace: wrapper.full_trace.join("\n"),
         env: env
       )
     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

@@ -342,7 +342,10 @@ module Logster
     def rate_limited?(ip_address, perform: false, limit: 60)
       key = ip_rate_limit_key(ip_address)
 
-      limited = @redis.exists(key)
+      limited = @redis.call([:exists, key])
+      if Integer === limited
+        limited = limited != 0
+      end
 
       if perform && !limited
         @redis.setex key, limit, ""

data/lib/logster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Logster
-  VERSION = "2.8.0"
+  VERSION = "2.9.4"
 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")
+    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")
+    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")
+    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_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"])

data/test/logster/test_redis_store.rb

@@ -1044,6 +1044,24 @@ class TestRedisStore < Minitest::Test
     end
   end
 
+  def test_messages_that_differ_only_by_numbers_or_hashes_are_merged
+    config_reset(allow_grouping: true) do
+      first_message = <<~TEXT
+        DistributedMutex("download_20450e291e8f1e5ba03ca7f20fb7d9da570c94a6"):
+        held for too long, expected max: 60 secs, took an extra 73 secs
+      TEXT
+      msg = @store.report(Logger::WARN, '', first_message, backtrace: caller)
+
+      second_message = <<~TEXT
+        DistributedMutex("download_e09ae082c60a351dedec67ed869652862b232a0b"):
+        held for too long, expected max: 60 secs, took an extra 287 secs
+      TEXT
+      msg2 = @store.report(Logger::WARN, '', second_message, backtrace: caller)
+
+      assert_equal(msg.key, msg2.key)
+    end
+  end
+
   private
 
   def config_reset(configs)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.4
 platform: ruby
 authors:
-- UI for viewing logs in Rack
+- Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-09-01 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