logster 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3410af7ae9feb8efd0c52f4cb7c2867cccd7ea30
-  data.tar.gz: f3c684edca2d1417fc999c7ab8cb449beddfccc1
+  metadata.gz: 484c833daa418abec6e50539b82a84bb07baf6d2
+  data.tar.gz: 28f4b8bdf0231275c386e618cabb1741e03ddf5e
 SHA512:
-  metadata.gz: b07a76fbdd0e8d2ba64c9bbbd54f7ecad6e4e3fb113ce082daecd30aa13c56b8b12078c67c3b54bffd0e731b40e19465c142f045efedf6bc7b649291c864f1be
-  data.tar.gz: 115e47a420bd7c69e49885651a555ab2a31eacaad1cbdce5ecf62add358360ad5a0535a017e52e1beee337b5d4ae59c2b0273c42f2dc47769d2254c256ed7299
+  metadata.gz: 2c1263387bcb227863dbc9a5fb9e0c8bf1beb07eeff85a70c08acdcf753bccfab6f33b17d61c948a6454c0f4921bafeef0750f127503bc86a734c366c684f2fc
+  data.tar.gz: 9c7fbb351f43a819138258c958c1850ff95a7f4ffb7c86c62c517dcd0990fd95efba3d0d98245b76a27b8bd1eea7f437920c8061f475d126646d5fb7a8ceba9e

data/README.md

@@ -96,6 +96,10 @@ Logster UI is built using [Ember.js](http://emberjs.com/)
 5. Create a new Pull Request
 
 # CHANGELOG
+- 2016-05-05: Version 1.2.3h
+  - Fix: clear_all now also clears rate limits
+  - Fix: protect against corrupt data in redis during clear
+
 - 2016-03-22: Version 1.2.2
   - Fix: Conflicting attributes and method name for `Logster::RedisStore#rate_limits`.
   - Fix: Rate limit checker was tracking limits too early. It should only track when a message has been bumped or saved.

data/lib/logster/redis_store.rb

@@ -8,6 +8,17 @@ module Logster
 
     attr_reader :duration, :callback
 
+    def self.clear_all(redis, redis_prefix=nil)
+      prefix = key_prefix(redis_prefix)
+
+      redis.eval "
+      local keys = redis.call('keys', '*#{prefix}*')
+      if (table.getn(keys) > 0) then
+        redis.call('del', unpack(keys))
+      end
+      "
+    end
+
     def initialize(redis, severities, limit, duration, redis_prefix = nil, callback = nil)
       @severities = severities
       @limit = limit
@@ -70,12 +81,17 @@ module Logster
 
     private
 
-    def key_prefix
-      if @redis_prefix
-        "#{@redis_prefix.call}:#{PREFIX}"
+    def self.key_prefix(redis_prefix)
+      if redis_prefix
+        "#{redis_prefix.call}:#{PREFIX}"
       else
         PREFIX
       end
+
+    end
+
+    def key_prefix
+      self.class.key_prefix(@redis_prefix)
     end
 
     def mget_keys(bucket_num)
@@ -213,6 +229,7 @@ module Logster
     end
 
     def clear
+      RedisRateLimiter.clear_all(@redis)
       @redis.del(solved_key)
       @redis.del(list_key)
       keys = @redis.smembers(protected_key) || []
@@ -225,7 +242,10 @@ module Logster
 
         sorted = protected
           .values
-          .map { |string| Message.from_json(string) }
+          .map { |string|
+            Message.from_json(string) rescue nil
+          }
+          .compact
           .sort
           .map(&:key)
 

data/lib/logster/version.rb

@@ -1,3 +1,3 @@
 module Logster
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/test/logster/test_redis_rate_limiter.rb

@@ -12,6 +12,35 @@ class TestRedisRateLimiter < Minitest::Test
     Timecop.return
   end
 
+  def test_clear_all
+    called = 0
+
+    @redis.set("dont_nuke", "1")
+
+    @rate_limiter = Logster::RedisRateLimiter.new(
+      @redis, [Logger::WARN], 8, 60, Proc.new { "prefix" }, Proc.new { called += 1 }
+    )
+
+    9.times do
+      @rate_limiter.check(Logger::WARN)
+    end
+
+    assert_equal 10, @rate_limiter.check(Logger::WARN)
+
+    Logster::RedisRateLimiter.clear_all(@redis, Proc.new { "prefix" })
+
+    assert_equal 1, @rate_limiter.check(Logger::WARN)
+
+    # also clears when prefix missing
+    Logster::RedisRateLimiter.clear_all(@redis)
+
+    assert_equal 1, @rate_limiter.check(Logger::WARN)
+
+    assert_equal "1", @redis.get("dont_nuke")
+    @redis.del("dont_nuke")
+
+  end
+
   def test_check
     time = Time.new(2015, 1, 1, 1, 1)
     Timecop.freeze(time)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - UI for viewing logs in Rack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -216,4 +216,3 @@ test_files:
 - test/logster/test_redis_rate_limiter.rb
 - test/logster/test_redis_store.rb
 - test/test_helper.rb
-has_rdoc: