logster 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97266a5b02f788e8537daaf28e0adff771a3bf6b
-  data.tar.gz: f43b618a847f9e98f54ecb9e469a29e0354a6947
+  metadata.gz: b7977f29deaddc757de884805c3ab10ad34979dd
+  data.tar.gz: 6c02e339cc7ee928c4a84d97f8183058ae5a6149
 SHA512:
-  metadata.gz: 22657415d4f4173ed2a1850e43a146d81db3c53e33d6009f99069fbe81671fb65d88809fc79a963b06744a17e288364706d1ef63127bcacb3076cc9be789e28d
-  data.tar.gz: 7e57a8c7862c3375948e2a097b89c1c1d3f023e33a32c928196371e3c7ef4c02b90df6828790d12fafb49c21acccf5b7810abe32220f4030e012ed463a271081
+  metadata.gz: 586e6ffde7e7ae5a5e8e11ca762b8f5ed0e94342682cf39e3c12adf0f70da449b657f9dfe04f56efe09e52704221bc08907dcd7f67ad848b91270405cf603600
+  data.tar.gz: c0749406fcf8b7981bd555ca691e3531a41f775acf4909b4f13f106753b144212b57bfddc6c2fca280a75a3d04a6f117973ed46853e478f39616b3bcf34a5254

data/README.md

@@ -97,11 +97,16 @@ Logster UI is built using [Ember.js](http://emberjs.com/)
 
 # CHANGELOG
 
-- 2015-03-18: Version 1.2.0
+- 2016-03-22: Version 1.2.1
+  - Feature: Add method to retrieve current rate from rate limiters.
+  - Feature: Make `RedisStore#rate_limits` readable.
+  - Feature: Make `RedisRateLimiter#callback` and `RedisRateLimiter#duration` readable.
+
+- 2016-03-18: Version 1.2.0
   - Fix: Move Redis configuration into RedisStore.
   - Feature: Allow `RedisStore#redis_prefix` to either be a String or a Proc.
 
-- 2015-02-11: Version 1.1.1
+- 2016-02-11: Version 1.1.1
   - Feature: Error rate can now be tracked in one minute and one hour buckets.
 
 - 2015-11-27: Version 1.0.1

data/lib/logster/redis_store.rb

@@ -6,6 +6,8 @@ module Logster
     BUCKETS = 6
     PREFIX = "__LOGSTER__RATE_LIMIT".freeze
 
+    attr_reader :duration, :callback
+
     def initialize(redis, severities, limit, duration, redis_prefix = nil, callback = nil)
       @severities = severities
       @limit = limit
@@ -14,6 +16,11 @@ module Logster
       @redis_prefix = redis_prefix
       @redis = redis
       @bucket_range = @duration / BUCKETS
+      @mget_keys = (0..(BUCKETS - 1)).map { |i| "#{key}:#{i}" }
+    end
+
+    def retrieve_rate
+      @redis.mget(@mget_keys).reduce(0) { |sum, value| sum + value.to_i }
     end
 
     def check(severity)
@@ -72,10 +79,9 @@ module Logster
     end
 
     def mget_keys(bucket_num)
-      @mget_keys ||= (0..(BUCKETS - 1)).map { |i| "\"#{key}:#{i}\"" }
       keys = @mget_keys.dup
       keys.delete_at(bucket_num)
-      keys.join(", ")
+      keys.map { |key| "'#{key}'" }.join(', ')
     end
 
     def bucket_number(time)
@@ -91,6 +97,7 @@ module Logster
 
     attr_accessor :redis, :max_backlog, :redis_raw_connection
     attr_writer :redis_prefix
+    attr_reader :rate_limits
 
     def initialize(redis = nil)
       super()

data/lib/logster/version.rb

@@ -1,3 +1,3 @@
 module Logster
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/test/logster/test_redis_rate_limiter.rb

@@ -9,6 +9,7 @@ class TestRedisRateLimiter < Minitest::Test
 
   def teardown
     @redis.flushall
+    Timecop.return
   end
 
   def test_check
@@ -143,16 +144,33 @@ class TestRedisRateLimiter < Minitest::Test
     assert_equal(1, @rate_limiter.check(Logger::WARN))
     assert_redis_key(60, 0)
 
-    array = ['lobster1', 'lobster2']
+    toggle = true
 
     @rate_limiter = Logster::RedisRateLimiter.new(
-      @redis, [Logger::WARN], 1, 60, Proc.new { array.delete_at(0) }
+      @redis, [Logger::WARN], 1, 60, Proc.new { toggle ? 'lobster1' : 'lobster2' }
     )
 
     assert_includes(key, "lobster1")
+
+    toggle = false
     assert_includes(key, "lobster2")
   end
 
+  def test_retrieve_rate
+    time = Time.new(2015, 1, 1, 1 , 1)
+    Timecop.freeze(time)
+
+    @rate_limiter = Logster::RedisRateLimiter.new(@redis, [Logger::WARN], 1, 60)
+
+    @rate_limiter.check(Logger::WARN)
+    assert_equal(@rate_limiter.retrieve_rate, 1)
+
+    Timecop.freeze(time + 50) do
+      @rate_limiter.check(Logger::WARN)
+      assert_equal(@rate_limiter.retrieve_rate, 2)
+    end
+  end
+
   private
 
   def key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - UI for viewing logs in Rack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler