ffwd 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 662d6ca5d2a1a07cf582c04a365f705c1cc807f9
-  data.tar.gz: 1a823ac6b62d55c1b2751830a6ffcdbb13c92fd9
+  metadata.gz: d359f0408acc2d8dc01aefbe73d265da27a87588
+  data.tar.gz: 079caae120a06beb6907796af8f7fd750cf11ffe
 SHA512:
-  metadata.gz: 1e8b9bf081c3883429a20a0be30c3f0b22203057061f45fe828f0a3b23ec8b193e58814915fcdc1e05193a1048a8fc1065adb44c2909ee64ac68575a0756fcf7
-  data.tar.gz: 602b3ea6457cab25305334696046d1b21364a70327e91767df9fd3b321f52462d9f6d642604c22540ee3484a2e16aa61669cea3385b0f9be577cc8e6352c9c62
+  metadata.gz: cf92d43e1a7542b291bd46ef5ccb12cda382b881ce1c2addbb882debd1c66c39d449b9f1ddfff217a923ea94e9ea9bcd391db92a764d3e259777ac4054ecf922
+  data.tar.gz: 76daa87ebb9972b3cfeb095d2fea347de78ff1bb46cb998ddd19c40dccb95aeaa783b33c2758899e3988047c0f048ae91436c4952aabb9d0f6d58ab8f8c6a3da

data/lib/ffwd/debug/monitor_session.rb

@@ -20,6 +20,7 @@ module FFWD::Debug
     attr_reader :id
 
     def initialize id, channel, type
+      @id = id
       @type = type
       @clients = {}
 

data/lib/ffwd/plugin/json.rb

@@ -27,7 +27,7 @@ module FFWD::Plugin::JSON
 
   DEFAULT_HOST = "localhost"
   DEFAULT_PORT = 19000
-  DEFAULT_PROTOCOL = "tcp"
+  DEFAULT_PROTOCOL = {"line" => "tcp", "frame" => "udp"}
   DEFAULT_KIND = "line"
 
   register_plugin "json",
@@ -80,11 +80,22 @@ module FFWD::Plugin::JSON
   KINDS = {"frame" => FrameConnection, "line" => LineConnection}
 
   def self.setup_input opts, core
-    protocol = FFWD.parse_protocol opts[:protocol] || DEFAULT_PROTOCOL
     kind = (opts[:kind] || DEFAULT_KIND).to_s
     raise "No such kind: #{kind}" unless connection = KINDS[kind]
+    protocol = FFWD.parse_protocol opts[:protocol] || DEFAULT_PROTOCOL[kind]
     opts[:host] ||= DEFAULT_HOST
     opts[:port] ||= DEFAULT_PORT
+
+    if connection == FrameConnection and protocol != FFWD::UDP
+      log.warning "When using :frame kind, you should use the UDP protocol." +
+                  " Not #{protocol.family.to_s.upcase}"
+    end
+
+    if connection == LineConnection and protocol != FFWD::TCP
+      log.warning "When using :line kind, you should use the TCP protocol. " +
+                  "Not #{protocol.family.to_s.upcase}"
+    end
+
     protocol.bind opts, core, log, connection
   end
 

data/lib/ffwd/processor/count.rb

@@ -38,7 +38,7 @@ module FFWD::Processor
       @emitter = emitter
       @cache_limit = opts[:cache_limit] || 1000
       @timeout = opts[:timeout] || 300
-      @period = opts[:period] || 10
+      @period = opts[:period] || 30
       @cache = {}
       @timer = nil
 

data/lib/ffwd/producing_client.rb

@@ -146,15 +146,20 @@ module FFWD
         return
       end
 
+      # store buffer sizes for use in callbacks.
+      events_size = @events.size
+      metrics_size = @metrics.size
+
       @request.callback do
-        increment :sent_events, @events.size
-        increment :sent_metrics, @metrics.size
+        increment :sent_events, events_size
+        increment :sent_metrics, metrics_size
         @request = nil
       end
 
-      @request.errback do
-        increment :failed_events, @events.size
-        increment :failed_metrics, @metrics.size
+      @request.errback do |e|
+        log.error "Failed to produce", e
+        increment :failed_events, events_size
+        increment :failed_metrics, metrics_size
         @request = nil
       end
     rescue => e

data/lib/ffwd/version.rb

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

metadata

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