logster 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 817153c3885fd064575528496f299e302802edff
-  data.tar.gz: 2adf2a219859d1d5a1b7163fa98714a3e0d353fc
+  metadata.gz: 27abd7df3fc47f5af41862411fc506de6a205a43
+  data.tar.gz: 1875f195f059603f9e14093ea9afd200b927a125
 SHA512:
-  metadata.gz: 40a5c76579e0f5145e3cdb490daab9550dd30e12d3e6be4609774aa045f46d33f3465ba20bcd0a1fe350de3000f92a9bff54c94cdb7032cbc1eccabb88765ea4
-  data.tar.gz: 33401bae4031a18e2d0e40f22679acfc1ebf0cb8515df2ea9084ca06e0eccb82a781ee34abeadf5dc4a5592c3327c77f246623b7724a40959ea330a6f4768df8
+  metadata.gz: ea1b1899505c10ad68907ead7fcada96fd9998528c8750ffb877616cb29ac9a7064d8167097d7b9691337d2393a7843be3caf836986f835f41d142f2418761a5
+  data.tar.gz: 641d21916328714c2290d8d42fb24698b5d3f67d5a895fe531de6fc1487d4097d9f352382335972e2e6ad511ddcdb1376d77ff02013fa15693cc284541d04216

data/README.md

@@ -74,3 +74,9 @@ Logster UI is built using [Ember.js](http://emberjs.com/)
   - Feature: Able to share logs, at /logs/show/(hexdigits)
   - Add protecting logs, so they aren't deleted when old (for use with sharing)
   - Restructured Redis data model
+- 2014-07-17: Version 0.1.1
+  - Refactored report method into base_store.rb - will be easier to make a new log store
+  - Add link in UI to clear all (non-protected) logs
+  - Add example of submitting logs from Sidekiq jobs
+  - Show Protect/Share links on all tabs
+  - Render hashes provided via Logster.add_to_env

data/assets/javascript/app.js

@@ -308,9 +308,11 @@ App.IndexController = Em.Controller.extend({
 
     clear: function() {
       var self = this;
-      App.ajax("/clear", { type: "POST" }).success(function() {
-        self.get('model').reload();
-      });
+      if (confirm("Clear the logs?\n\nCancel = No, OK = Clear")) {
+        App.ajax("/clear", { type: "POST" }).success(function() {
+          self.get('model').reload();
+        });
+      }
     },
 
     protect: function(message) {

data/assets/javascript/templates/show.handlebars

@@ -1,3 +1,4 @@
+{{#link-to 'index'}}< Recent{{/link-to}}
 <div id="bottom-panel" class="full">
     {{message-info currentMessage=model}}
 </div>

data/lib/logster.rb

@@ -34,8 +34,8 @@ module Logster
   end
 end
 
-Logster.config.current_context = lambda{|env, &block| block.call}
-Logster.config.authorize_callback = lambda{|env| true}
+Logster.config.current_context = lambda{ |env, &block| block.call }
+Logster.config.authorize_callback = lambda{ |env| true }
 
 if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 3
   require 'logster/rails/railtie'

data/lib/logster/base_store.rb

@@ -38,12 +38,11 @@ module Logster
       not_implemented
     end
 
-    def report(severity, progname, message, opts = {})
-      return if (!message || (String === message && message.empty?)) && skip_empty
+    def report(severity, progname, msg, opts = {})
+      return if (!msg || (String === msg && msg.empty?)) && skip_empty
       return if level && severity < level
-      return if ignore && ignore.any? { |pattern| message =~ pattern}
 
-      message = Logster::Message.new(severity, progname, message, opts[:timestamp])
+      message = Logster::Message.new(severity, progname, msg, opts[:timestamp])
 
       env = opts[:env]
       backtrace = opts[:backtrace]
@@ -66,6 +65,8 @@ module Logster
         message.backtrace = caller.join("\n")
       end
 
+      return if ignore && ignore.any? { |pattern| message =~ pattern}
+
       save message
 
       message

data/lib/logster/ignore_pattern.rb

@@ -0,0 +1,61 @@
+module Logster
+  class IgnorePattern
+
+    def initialize(message_pattern=nil, env_patterns=nil)
+      @msg_match = message_pattern
+      @env_match = env_patterns
+    end
+
+    def self.from_message_and_request_uri(msg, request)
+      IgnorePattern.new(msg, {REQUEST_URI: request})
+    end
+
+    def matches?(message)
+      if @msg_match
+        return false unless compare(message.message, @msg_match)
+      end
+
+      if @env_match
+        return false unless compare(message.env, @env_match)
+      end
+
+      true
+    end
+
+    def to_s
+      "<#Logster::IgnorePattern, msg_match: #{@msg_match.inspect}, env_match: #{@env_match.inspect}>"
+    end
+
+    private
+
+    def compare(message, pattern)
+      case pattern
+        when Regexp
+          message =~ pattern
+        when String
+          message.downcase =~ Regexp.new(pattern.downcase, Regexp::IGNORECASE)
+        when Hash
+          compare_hash(message, pattern)
+        when NilClass
+          true
+        else
+          true
+      end
+    end
+
+    def compare_hash(message_hash, pattern_hash)
+      return false unless message_hash
+      pattern_hash.each do |key, value|
+        return false unless compare(get_indifferent(message_hash, key), value)
+      end
+      true
+    end
+
+    def get_indifferent(hash, key)
+      return hash[key] if hash[key]
+      return hash[key.to_s] if hash[key.to_s]
+      return hash[key.to_sym] if hash[key.to_sym]
+      nil
+    end
+  end
+end

data/lib/logster/message.rb

@@ -92,6 +92,21 @@ module Logster
       self.key <=> other.key
     end
 
+    def =~(pattern)
+      case pattern
+        when Hash
+          IgnorePattern.new(nil, pattern).matches? self
+        when String
+          IgnorePattern.new(pattern, nil).matches? self
+        when Regexp
+          IgnorePattern.new(pattern, nil).matches? self
+        when IgnorePattern
+          pattern.matches? self
+        else
+          nil
+      end
+    end
+
     protected
 
     def get_timestamp

data/lib/logster/version.rb

@@ -1,3 +1,3 @@
 module Logster
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/logster/test_base_store.rb

@@ -1,5 +1,6 @@
 require_relative '../test_helper'
 require 'logster/base_store'
+require 'logster/ignore_pattern'
 
 class TestBaseStore < Minitest::Test
 
@@ -50,6 +51,57 @@ class TestBaseStore < Minitest::Test
     assert_equal(4, @store.count)
   end
 
+  def test_ignore_pattern_basic
+    @store.ignore = [
+        Logster::IgnorePattern.new(nil, {username: 'CausingErrors'})
+    ]
+    @store.report(Logger::WARN, "test", "Foobar") #
+    @store.report(Logger::WARN, "test", "Foobar", { env: { username: 'CausingErrors' }})
+    @store.report(Logger::WARN, "test", "Something Else", { env: { username: 'CausingErrors' }})
+    @store.report(Logger::WARN, "test", "Something Else", { env: { 'username' => 'CausingErrors' }})
+    @store.report(Logger::WARN, "test", "Something Else", { env: { username: 'GoodPerson' }}) #
+    @store.report(Logger::WARN, "test", "Can't verify CSRF token authenticity") #
+
+    assert_equal(3, @store.count)
+  end
+
+  def test_ignore_pattern_real
+    @store.ignore = [
+        /^ActionController::RoutingError \(No route matches/,
+        Logster::IgnorePattern.new("Can't verify CSRF token authenticity", { REQUEST_URI: /\/trackback\/$/ })
+    ]
+    # blocked
+    @store.report(Logger::WARN, "whatever", "Can't verify CSRF token authenticity", {
+        env: {
+            HTTP_HOST: 'meta.discourse.org',
+            REQUEST_URI: '/t/use-more-standard-smiley-codes-instead-of-smile/1822/trackback/',
+            REQUEST_METHOD: 'POST',
+            HTTP_USER_AGENT: 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)',
+            params: {
+                title: 'Something Spammy',
+                url: 'http://spam.example.net/whatever/spam.html',
+                excerpt: 'http://spam.example.com/pdf/blahblah.html free viagra',
+                blog_name: 'get free spam for cheap'
+            }
+        }
+    })
+    # logged
+    @store.report(Logger::WARN, "whatever", "Can't verify CSRF token authenticity", {
+        env: {
+            HTTP_HOST: 'meta.discourse.org',
+            REQUEST_URI: '/session',
+            REQUEST_METHOD: 'POST',
+            HTTP_USER_AGENT: 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.153 Safari/537.36',
+            params: {
+                username: 'user',
+                password: 'password',
+                form_authenticity_token: 'incorrect'
+            }
+        }
+    })
+    assert_equal(1, @store.count)
+  end
+
   def test_timestamp
     time = Time.now - 24*60*60
     message = @store.report(Logger::WARN, "test", "B", timestamp: time)

data/vendor/assets/javascripts/logster.js.erb

@@ -1,9 +1,18 @@
-(function(){
+(function() {
   var lastReport = null;
 
+  if (!window.Logster) {
+    window.Logster = {
+      enabled: true
+    };
+  }
+
   window.onerror = function(message, url, line, column, errorObj) {
     // never bother reporting more than once a minute
-    if(lastReport && new Date() - lastReport < 1000 * 60) {
+    if (lastReport && new Date() - lastReport < 1000 * 60) {
+      return;
+    }
+    if (!Logster.enabled) {
       return;
     }
 
@@ -17,11 +26,11 @@
       window_location: window.location && (window.location + "")
     };
 
-    if(errorObj && errorObj.stack) {
+    if (errorObj && errorObj.stack) {
       err.stacktrace = errorObj.stack;
     }
 
-    $.ajax("<%= Logster.config.subdirectory || '/logs' %>" + "/report_js_error",{
+    $.ajax("<%= Logster.config.subdirectory || '/logs' %>" + "/report_js_error", {
       data: err,
       type: "POST",
       cache: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - UI for viewing logs in Rack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ files:
 - lib/logster.rb
 - lib/logster/base_store.rb
 - lib/logster/configuration.rb
+- lib/logster/ignore_pattern.rb
 - lib/logster/logger.rb
 - lib/logster/message.rb
 - lib/logster/middleware/debug_exceptions.rb