ffwd-statsd 0.1.7 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d3b4a2e4bcc5b14ee961b01cf6c0dc3c5e70e6f9
+  data.tar.gz: 69c7889991e1805b59406940512b4aec82137bea
+SHA512:
+  metadata.gz: 3b4795f0c30ef9bb1550251651eba363fc414e319ec47f23e95d0d19145078ebd9f1efe57765bb0fd4d72e758fe11b97b190459114ec90ac8ad23c0a2fab6043
+  data.tar.gz: 5c09548c46acd68ef354d8e6eb220f1fe0b1e1d86761fa00f9cfd508b1fbb7055f716beafcbcc81403655987224cd69db9351dfc772335ad34e6550fcd02114d

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

@@ -13,63 +13,30 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'ffwd/logging'
 require 'ffwd/connection'
 
 require_relative 'parser'
 
 module FFWD::Plugin::Statsd
-  module Connection
-    module ConnectionBase
-      def receive_statsd_frame(data)
-        metric = Parser.parse(data)
-        return if metric.nil?
-        @core.input.metric metric
-        @bind.increment :received_metrics
-      rescue ParserError => e
-        log.error "Invalid frame '#{data}': #{e}"
-        @bind.increment :failed_metrics
-      rescue => e
-        log.error "Error when parsing metric '#{data}'", e
-        @bind.increment :failed_metrics
-      end
+  class Connection < FFWD::Connection
+    def initialize bind, core, config
+      @bind = bind
+      @core = core
     end
 
-    class UDP < FFWD::Connection
-      include ConnectionBase
-      include FFWD::Logging
-
-      def initialize bind, core
-        @bind = bind
-        @core = core
-      end
-
-      def self.plugin_type
-        "statsd_udp_in"
-      end
-
-      def receive_data data
-        receive_statsd_frame data
-      end
-    end
-
-    class TCP < FFWD::Connection
-      include ConnectionBase
-      include FFWD::Logging
-      include EM::Protocols::LineText2
-
-      def initialize bind, core
-        @bind = bind
-        @core = core
-      end
-
-      def self.plugin_type
-        "statsd_tcp_in"
-      end
-
-      def receive_line(data)
-        receive_statsd_frame data
-      end
+    protected
+
+    def receive_statsd_frame(data)
+      metric = Parser.parse(data)
+      return if metric.nil?
+      @core.input.metric metric
+      @bind.increment :received_metrics
+    rescue ParserError => e
+      log.error "Invalid frame '#{data}': #{e}"
+      @bind.increment :failed_metrics
+    rescue => e
+      log.error "Error when parsing metric '#{data}'", e
+      @bind.increment :failed_metrics
     end
   end
 end

data/lib/ffwd/plugin/statsd/version.rb

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module Statsd
-      VERSION = "0.1.7"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/ffwd/plugin/statsd.rb

@@ -27,29 +27,43 @@ module FFWD::Plugin::Statsd
 
   DEFAULT_HOST = "localhost"
   DEFAULT_PORT = 8125
+  DEFAULT_PROTOCOL = "udp"
 
-  INPUTS = {:tcp => Connection::TCP, :udp => Connection::UDP}
+  class InputUDP < FFWD::Plugin::Statsd::Connection
+    def self.plugin_type
+      "statsd_udp_in"
+    end
 
-  def self.setup_input opts, core
-    opts[:host] ||= DEFAULT_HOST
-    opts[:port] ||= DEFAULT_PORT
-    protocol = FFWD.parse_protocol(opts[:protocol] || "udp")
+    def receive_data data
+      receive_statsd_frame data
+    end
+  end
 
-    unless connection = INPUTS[protocol.family]
-      raise "No connection for protocol family: #{protocol.family}"
+  class InputTCP < FFWD::Plugin::Statsd::Connection
+    include EM::Protocols::LineText2
+
+    def self.plugin_type
+      "statsd_tcp_in"
     end
 
-    protocol.bind opts, core, log, connection
+    def receive_line(data)
+      receive_statsd_frame data
+    end
   end
 
-  def self.setup_tunnel opts, core, tunnel
-    opts[:port] ||= DEFAULT_PORT
-    protocol = FFWD.parse_protocol(opts[:protocol] || "tcp")
+  INPUTS = {:tcp => InputTCP, :udp => InputUDP}
+
+  def self.setup_input config
+    config[:host] ||= DEFAULT_HOST
+    config[:port] ||= DEFAULT_PORT
+    config[:protocol] ||= DEFAULT_PROTOCOL
+
+    protocol = FFWD.parse_protocol config[:protocol]
 
     unless connection = INPUTS[protocol.family]
       raise "No connection for protocol family: #{protocol.family}"
     end
 
-    protocol.tunnel opts, core, tunnel, log, connection
+    protocol.bind config, log, connection
   end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-statsd
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - John-John Tedro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffwd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -67,32 +60,31 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ffwd/plugin/statsd.rb
-- lib/ffwd/plugin/statsd/version.rb
 - lib/ffwd/plugin/statsd/parser.rb
 - lib/ffwd/plugin/statsd/connection.rb
+- lib/ffwd/plugin/statsd/version.rb
 homepage: https://github.com/spotify/ffwd
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: StatsD support for FFWD.
 test_files: []