ffwd-carbon 0.1.7 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f0680495c78baca38bf4eb33934546b20f888202
+  data.tar.gz: fd1b1b9b4dff741be23d68304db804d4d5b2e865
+SHA512:
+  metadata.gz: e67d02de0feafd6f14dee2c84684f4734cd1a4b0c5270ac8eb141d06f9affcf0295a1c9987f44fb8cc54742cb30fc19db8b7378868cbd386814e1282016c23a6
+  data.tar.gz: a5fab61a8d6b1b58ebcde15a039ede5fced7c36399160ad5a1a663e79493f048ee7c424968461fe9a76279122b60f388712815568701bf0d4cffd702da73bf1b

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

@@ -13,27 +13,19 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'eventmachine'
-
-require 'ffwd/logging'
 require 'ffwd/connection'
 
 module FFWD::Plugin
   module Carbon
     class Connection < FFWD::Connection
-      include FFWD::Logging
       include EM::Protocols::LineText2
 
-      def self.plugin_type
-        "carbon_in"
-      end
-
-      def initialize bind, core
+      def initialize bind, core, config
         @bind = bind
         @core = core
       end
 
-      def parse(line)
+      def parse line
         path, value, timestamp = line.split ' ', 3
         raise "invalid frame" if timestamp.nil?
 
@@ -45,13 +37,13 @@ module FFWD::Plugin
         return {:key => path, :value => value, :time => time}
       end
 
-      def receive_line(ln)
-        metric = parse(ln)
+      def receive_line line
+        metric = parse line
         return if metric.nil?
         @core.input.metric metric
         @bind.increment :received_metrics
       rescue => e
-        log.error "Failed to receive data", e
+        @bind.log.error "Failed to receive data", e
       end
     end
   end

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

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

data/lib/ffwd/plugin/carbon.rb

@@ -43,17 +43,31 @@ module FFWD::Plugin
           ]),
       ]
 
-    def self.setup_input opts, core
-      opts[:host] ||= DEFAULT_HOST
-      opts[:port] ||= DEFAULT_PORT
-      protocol = FFWD.parse_protocol(opts[:protocol] || DEFAULT_PROTOCOL)
-      protocol.bind opts, core, log, Connection
+    class InputTCP < FFWD::Plugin::Carbon::Connection
+      def self.plugin_type
+        "carbon_tcp_in"
+      end
     end
 
-    def self.setup_tunnel opts, core, tunnel
-      opts[:port] ||= DEFAULT_PORT
-      protocol = FFWD.parse_protocol(opts[:protocol] || DEFAULT_PROTOCOL)
-      protocol.tunnel opts, core, tunnel, log, Connection
+    class InputUDP < FFWD::Plugin::Carbon::Connection
+      def self.plugin_type
+        "carbon_udp_in"
+      end
+    end
+
+    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 "Not supported protocol: #{protocol}"
+      end
+
+      protocol.bind config, log, connection
     end
   end
 end

metadata

@@ -1,32 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-carbon
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Martin Parm
 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
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - parmus@spotify.com
@@ -34,32 +59,31 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ffwd/plugin/carbon.rb
-- lib/ffwd/plugin/carbon/version.rb
 - lib/ffwd/plugin/carbon/connection.rb
+- lib/ffwd/plugin/carbon/version.rb
+- lib/ffwd/plugin/carbon.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: Carbon support for FFWD.
 test_files: []