ezmetrics 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92da4bdfb62dd5fdfffb963b9ac7bd495ee23f79
-  data.tar.gz: d92a3bef8073d80cb09c0f08d5d80e5ae7d8ce80
+  metadata.gz: 475ced129635b18e5c1239c72b6458b88f5733b9
+  data.tar.gz: bc2c498c2d5b6773f7cbc995f10c8e8d1c8f1e25
 SHA512:
-  metadata.gz: fae80b74ebf4249fc595fa162d5af72acabd2370bd4c917970896e072c3a5fbded5a6465c8a5f80bf0e05d947e30e969a5a81074eefbb05d797debfc1335d538
-  data.tar.gz: 450a7093e3c63c604452892cbb1f61ebb372f313a5d155247beae834afecafca2143a2bc90ec941e57b8edeee8c3ca2f1da56f9a8eb3a8da587891503dd57852
+  metadata.gz: 45f9625c446f68a92e501d0f3d815b64c3751c76170a16da2b887a9e45fb3b3c267fa03f526e667f821e06e633e1df2e42641e4f3553aa9fa6f46300aa0e5ec5
+  data.tar.gz: a5ec929272536f76d9e9527e1b63d9a3d7ec2850f470e46eeadf5b13947af6b2558f676aa687ffaca28e39d1f7070c8eff0f4c27f730fc46455bfba49711638b

data/lib/ezmetrics.rb

@@ -2,11 +2,12 @@ require "redis" unless defined?(Redis)
 require "json"  unless defined?(JSON)
 
 class EZmetrics
-  attr_reader :redis, :last_minute_metrics, :requests, :redis_key
+  attr_reader :redis, :interval_seconds, :interval_metrics, :requests, :redis_key
 
-  def initialize
-    @redis = Redis.new
-    @redis_key = "ez-metrics"
+  def initialize(interval_seconds=60)
+    @interval_seconds = interval_seconds.to_i
+    @redis            = Redis.new
+    @redis_key        = "ez-metrics"
   end
 
   def log(payload)
@@ -17,7 +18,7 @@ class EZmetrics
       status:   payload[:status].to_i
     }
 
-    current_second      = Time.now.sec
+    current_second      = Time.now.to_i
     status_group        = "#{payload[:status].to_s[0]}xx"
     this_second_metrics = redis.get("#{redis_key}:#{current_second}")
 
@@ -45,17 +46,18 @@ class EZmetrics
       this_second_metrics["statuses"][status_group] = 1
     end
 
-    redis.setex("#{redis_key}:#{current_second}", 59, JSON.generate(this_second_metrics))
+    redis.setex("#{redis_key}:#{current_second}", interval_seconds, JSON.generate(this_second_metrics))
   rescue => error
     display_error(error)
   end
 
   def show
-    @last_minute_metrics = redis.mget((0..59).to_a.map { |second| "#{redis_key}:#{second}" }).compact.map { |m| JSON.parse(m) }
+    interval_start    = Time.now.to_i - interval_seconds
+    @interval_metrics = redis.mget((interval_start..Time.now.to_i).to_a.map { |second| "#{redis_key}:#{second}" }).compact.map { |m| JSON.parse(m) }
 
-    return empty_metrics unless last_minute_metrics.any?
+    return empty_metrics unless interval_metrics.any?
 
-    @requests = last_minute_metrics.map { |h| h["statuses"]["all"] }.compact.sum
+    @requests = interval_metrics.map { |h| h["statuses"]["all"] }.compact.sum
 
     {
       duration: {
@@ -87,15 +89,15 @@ class EZmetrics
   private
 
   def avg(metrics)
-    (last_minute_metrics.map { |h| h[metrics.to_s] }.sum.to_f / requests).round
+    (interval_metrics.map { |h| h[metrics.to_s] }.sum.to_f / requests).round
   end
 
   def max(metrics)
-    last_minute_metrics.map { |h| h[metrics.to_s] }.max.round
+    interval_metrics.map { |h| h[metrics.to_s] }.max.round
   end
 
   def count(group)
-    last_minute_metrics.map { |h| h["statuses"][group.to_s] }.sum
+    interval_metrics.map { |h| h["statuses"][group.to_s] }.sum
   end
 
   def display_error(error)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ezmetrics
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Nicolae Rotaru