ffwd-collectd 0.1.7 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 51efe82a0a7d19337420ffdbd9bf160e8322b4d5
+  data.tar.gz: 72c15751dec28ab04b539069e8aeb31820fbf053
+SHA512:
+  metadata.gz: 7414e955b753c15e7ac621d7afe5bd7b1a426a7357a302a8027506ec330324c1e13fadd787ab5f8bfb9698cce754d6c736eddddd3d6e71b168d259ad03fd09a5
+  data.tar.gz: d71cd9018530179a3dc7359eb3d3155c9584757a406170d55e3eaa4cd115fe0a2a4a94a4e91678f40c21380827148186640a33e10a70edea55da86cbf3a00d53

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

@@ -13,23 +13,17 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'ffwd/logging'
 require 'ffwd/connection'
 
 require_relative 'parser'
+require_relative 'types_db'
 
 module FFWD::Plugin::Collectd
   class Connection < FFWD::Connection
-    include FFWD::Logging
-
-    def self.plugin_type
-      "collectd_in"
-    end
-
-    def initialize bind, core, types_db
+    def initialize bind, core, config
       @bind = bind
       @core = core
-      @types_db = types_db
+      @types_db = TypesDB.open config[:types_db]
     end
 
     def receive_data(data)
@@ -77,7 +71,7 @@ module FFWD::Plugin::Collectd
         end
       end
     rescue => e
-      log.error "Failed to receive data", e
+      @bind.log.error "Failed to receive data", e
     end
   end
 end

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

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

data/lib/ffwd/plugin/collectd.rb

@@ -18,7 +18,6 @@ require 'ffwd/protocol'
 require 'ffwd/logging'
 
 require_relative 'collectd/connection'
-require_relative 'collectd/types_db'
 
 module FFWD::Plugin::Collectd
   include FFWD::Plugin
@@ -47,21 +46,31 @@ module FFWD::Plugin::Collectd
       ),
     ]
 
-  def self.setup_input opts, core
-    opts[:host] ||= DEFAULT_HOST
-    opts[:port] ||= DEFAULT_PORT
-    opts[:types_db] ||= DEFAULT_TYPES_DB
-    protocol = FFWD.parse_protocol(opts[:protocol] || "udp")
-    types_db = TypesDB.open opts[:types_db]
-    protocol.bind opts, core, log, Connection, types_db
+  class InputTCP < FFWD::Plugin::Collectd::Connection
+    def self.plugin_type
+      "collectd_tcp_in"
+    end
   end
 
-  def self.setup_tunnel opts, core, tunnel
-    opts[:port] ||= DEFAULT_PORT
-    opts[:types_db] ||= DEFAULT_TYPES_DB
-    protocol = FFWD.parse_protocol(opts[:protocol] || "udp")
-    protocol.tunnel log, opts, Connection
-    types_db = TypesDB.open opts[:types_db]
-    protocol.bind opts, core, tunnel, log, Connection, types_db
+  class InputUDP < FFWD::Plugin::Collectd::Connection
+    def self.plugin_type
+      "collectd_udp_in"
+    end
+  end
+
+  INPUTS = {:tcp => InputTCP, :udp => InputUDP}
+
+  def self.setup_input config
+    config[:host] ||= DEFAULT_HOST
+    config[:port] ||= DEFAULT_PORT
+    config[:types_db] ||= DEFAULT_TYPES_DB
+    config[:protocol] ||= "udp"
+    protocol = FFWD.parse_protocol config[:protocol]
+
+    unless connection = INPUTS[protocol.family]
+      raise "Not a supported protocol: #{protocol}"
+    end
+
+    protocol.bind config, log, connection
   end
 end

metadata

@@ -1,32 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-collectd
 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
+    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:
 - udoprog@spotify.com
@@ -34,34 +59,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ffwd/plugin/collectd/version.rb
 - lib/ffwd/plugin/collectd/parser.rb
 - lib/ffwd/plugin/collectd/types_db.rb
 - lib/ffwd/plugin/collectd/connection.rb
+- lib/ffwd/plugin/collectd/version.rb
 - lib/ffwd/plugin/collectd.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: collectd support for FFWD.
 test_files: []