ffwd 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 647ed80926a63a5df7f6c20d4be87b237244189d
-  data.tar.gz: d143ffb328b1bb2720c0c5c6f91872168529e758
+  metadata.gz: 7b83d6d295f24ccd855c350f96f7b51ae087c89a
+  data.tar.gz: 43069839db9dcad2026337c4865d23e4bf03f74b
 SHA512:
-  metadata.gz: b763d815a4154cab969ab6e580b23b9755c371e51517f40d2df40830f43ce7178838a2e2e369ce8af44f39f750c899c596f43c6b10808058958d1dacf15e448a
-  data.tar.gz: 97a504bc1c44ff2ebe913b64427eb86a9ca08fac87159eb70f25f09cabbf6aa3150a1c7393c410473bbd226b6b105a9b44be29799e5e9ceded7c73dfbf9c8fe7
+  metadata.gz: d2a66bf892b67f376013ea6b1ab9426d241e20ebeb830fb5850ff520c0edd6b20f09296d999e7d839e54bc23f8aecad249a65ba8a04e75cdda0362156ca292d9
+  data.tar.gz: b66d163452d86cf43c44bfbd7696e4b3c5e91dd3bd26a35a05203cf15dfb9b204025c24259cad8f6e14e903a97d1b0d37d08b862ce91373e6a86a23efe6cde6b

data/lib/ffwd/protocol/tcp/flushing_connect.rb

@@ -71,13 +71,13 @@ module FFWD::TCP
 
         unless ignored.include? :events
           event_consumer = setup_consumer(
-            @event_buffer, forced_flush_factor, event_limit, :dropped_events)
+            @event_buffer, event_limit, forced_flush_factor, :dropped_events)
           @subs << core.output.event_subscribe(&event_consumer)
         end
 
         unless ignored.include? :metrics
           metric_consumer = setup_consumer(
-            @metric_buffer, forced_flush_factor, metric_limit, :dropped_metrics)
+            @metric_buffer, metric_limit, forced_flush_factor, :dropped_metrics)
           @subs << core.output.metric_subscribe(&metric_consumer)
         end
       end
@@ -130,9 +130,8 @@ module FFWD::TCP
 
     private
 
-    def setup_consumer buffer, drop, flush, statistics_key
-      drop_limit = drop
-      forced_flush_limit = drop * flush
+    def setup_consumer buffer, drop_limit, forced_flush_factor, statistics_key
+      forced_flush_limit = drop_limit * forced_flush_factor
 
       proc do |e|
         if buffer.size >= drop_limit

data/lib/ffwd/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module FFWD
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/fwc.rb

@@ -61,7 +61,9 @@ module FWC
       :summary => false,
       :raw => false,
       :raw_threshold => 100,
-      :report_interval => 10
+      :report_interval => 10,
+      :key => nil,
+      :tags => nil
     }
   end
 
@@ -88,6 +90,15 @@ module FWC
       o.on "-i", "--report-interval", "Interval in seconds to generate report" do |d|
         opts[:report_interval] = d.to_i
       end
+
+      o.on "--key <key>", "Only handle events and metrics matching the specified key" do |d|
+        opts[:key] = d
+      end
+
+      o.on "--tag <tag>", "Only handle event and metrics which matches the specified tag" do |d|
+        opts[:tags] ||= []
+        opts[:tags] << d
+      end
     end
   end
 
@@ -96,7 +107,8 @@ module FWC
   end
 
   class Summary
-    def initialize
+    def initialize matcher
+      @matcher = matcher
       @groups = {}
     end
 
@@ -119,6 +131,8 @@ module FWC
     end
 
     def receive data
+      return if not @matcher.matches? data
+
       id = [data["id"], data["type"]]
       group = (@groups[id] ||= {:id => data["id"], :type => data["type"],
                                 :items => {}})
@@ -135,8 +149,9 @@ module FWC
   end
 
   class Raw
-    def initialize threshold
-      @threshold = threshold
+    def initialize matcher, opts={}
+      @threshold = opts[:threshold]
+      @matcher = matcher
       @count = 0
       @rate = 0
       @disabled = false
@@ -155,6 +170,12 @@ module FWC
     end
 
     def receive data
+      return if not @matcher.matches? data
+
+      if not @tags.nil? and not (@tags & (d["tags"] || [])).empty?
+        return
+      end
+
       if not @disabled and @count > 100
         diff = (Time.now - @first)
         rate = (@count / diff)
@@ -175,17 +196,41 @@ module FWC
     end
   end
 
+  class Matcher
+    def initialize opts={}
+      @key = opts[:key]
+      @tags = opts[:tags]
+    end
+
+    def matches? data
+      return false unless ["event", "metric"].include? data["type"]
+
+      d = data["data"]
+      return false unless d
+
+      key = d["key"]
+      return false if @key and @key != key
+
+      tags = d["tags"]
+      return false if @tags and (@tags & (tags || [])).empty?
+
+      true
+    end
+  end
+
   def self.main(args)
     parse_options args
 
+    matcher = Matcher.new(:key => opts[:key], :tags => opts[:tags])
+
     handlers = []
 
     if opts[:summary]
-      handlers << Summary.new
+      handlers << Summary.new(matcher)
     end
 
     if opts[:raw]
-      handlers << Raw.new(opts[:raw_threshold])
+      handlers << Raw.new(matcher, :threshold => opts[:raw_threshold])
     end
 
     if handlers.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffwd
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - John-John Tedro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine