ffwd 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ab8188ceb50b7d6c8d0843c0d41cc15e2bdb2e9
-  data.tar.gz: ded99314a2159032e871f0426646c29960438d12
+  metadata.gz: c295242d5e946456b427bee9e90460f9ec0dd071
+  data.tar.gz: dc6f89b142d7f5446a01682e347e784ef1641f58
 SHA512:
-  metadata.gz: c875d87b096ae71a0f645d63bcf2b8ec77940201aad9325b0dc432735ae83701bfba40a00ee4bc44828e479556027af49deb272a441959cfd3c399c4f49e9104
-  data.tar.gz: 6060dbbe25cab2e52ddc6fa67cb2b754955a936d42f28bdcf3210b2695e567b173b66be29f4b0b8837570d2249ee57619fc0c662d3f1a2c8274307eb63fdc43e
+  metadata.gz: 118a3cadbe8cb5530a869184f55e3787d3247a7a37b34bcb11be05e6dcd45c39505ffa214018a3e9e858c589ce7affa3e102b99e4aa316bfd23ad243a8b37887
+  data.tar.gz: 237ca9680135e557dc107ae47774c55e798a1b0fc4ac351ec3efdb8f3b06b1378239a92d7c41e88b3244333af3528d6d3e919bcb56ef7b171ad3aff67fbd30c7

data/lib/ffwd/plugin/json/connection.rb

@@ -15,13 +15,10 @@
 
 require 'eventmachine'
 
-require 'ffwd/logging'
 require 'ffwd/connection'
 
 module FFWD::Plugin::JSON
   class Connection < FFWD::Connection
-    include FFWD::Logging
-
     EVENT_FIELDS = [
       ["key", :key],
       ["value", :value],
@@ -50,8 +47,7 @@ module FFWD::Plugin::JSON
       data = JSON.load(data)
 
       unless type = data["type"]
-        log.error "Field 'type' missing from received line"
-        return
+        raise "Field 'type' missing from received line"
       end
 
       if type == "metric"
@@ -66,9 +62,7 @@ module FFWD::Plugin::JSON
         return
       end
 
-      log.error "No such type: #{type}"
-    rescue => e
-      log.error "Failed to receive line", e
+      raise "No such type: #{type}"
     end
 
     def read_tags d, source

data/lib/ffwd/plugin/json.rb

@@ -51,6 +51,7 @@ module FFWD::Plugin::JSON
     ]
 
   class LineConnection < FFWD::Plugin::JSON::Connection
+    include FFWD::Logging
     include EM::Protocols::LineText2
 
     def self.plugin_type
@@ -59,16 +60,22 @@ module FFWD::Plugin::JSON
 
     def receive_line data
       receive_json data
+    rescue => e
+      log.error "Failed to receive JSON: #{data.inspect}: #{e}"
     end
   end
 
   class FrameConnection < FFWD::Plugin::JSON::Connection
+    include FFWD::Logging
+
     def self.plugin_type
       "json_frame_in"
     end
 
     def receive_data data
       receive_json data
+    rescue => e
+      log.error "Failed to receive JSON: #{data.inspect}: #{e}"
     end
   end
 

data/lib/ffwd/protocol/udp/bind.rb

@@ -58,6 +58,7 @@ module FFWD::UDP
 
         if size = config[:receive_buffer_size]
           log.debug "Setting receive buffer size to #{size}"
+          @socket.set_sock_opt Socket::SOL_SOCKET, Socket::SO_RCVBUFFORCE, true
           @socket.set_sock_opt Socket::SOL_SOCKET, Socket::SO_RCVBUF, size
         end
 

data/lib/ffwd/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffwd
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - John-John Tedro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Core framework for the FastForward Daemon.