ffwd-riemann 0.1.7 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 26799a65a4b9c7da9fb5a91d475b0ceafc908b38
+  data.tar.gz: 48fc183e8bab98a8f4092faf1cabc62fd7e0a30f
+SHA512:
+  metadata.gz: 179a4d1c73fbae1c09ea37249718512561ffc58e40de3d8e8a6b94aec0858d03c36cff36b6c710d4906ff26a106ccbd843b37e60e7dbfaa319f0715a9ee3be3e
+  data.tar.gz: 05251cf4e2e10a0a8ac257e0b5a0b937e0e2764de8cc1d4b806bf2b9a22a2e22cf21c4893b6ee8e15272a21d0f177d452506e33230100c93e6d03517d69aff95

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

@@ -29,10 +29,10 @@ module FFWD::Plugin::Riemann
       FFWD::Plugin::Riemann::Connection::Serializer
     end
 
-    def initialize bind, core, log
+    def initialize bind, core, config
       @bind = bind
       @core = core
-      @log = log
+      @config = config
     end
 
     def receive_object(m)
@@ -51,7 +51,7 @@ module FFWD::Plugin::Riemann
       send_ok
     rescue => e
       @bind.increment :failed_events, m.events.size
-      @log.error "Failed to receive object", e
+      @bind.log.error "Failed to receive object", e
       send_error e
     end
 

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

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

data/lib/ffwd/plugin/riemann.rb

@@ -104,39 +104,31 @@ module FFWD::Plugin::Riemann
   OUTPUTS = {:tcp => OutputTCP, :udp => OutputUDP}
   INPUTS = {:tcp => InputTCP, :udp => InputUDP}
 
-  def self.setup_output opts, core
-    opts[:host] ||= DEFAULT_HOST
-    opts[:port] ||= DEFAULT_PORT
+  def self.setup_output config
+    config[:host] ||= DEFAULT_HOST
+    config[:port] ||= DEFAULT_PORT
+    config[:protocol] ||= DEFAULT_PROTOCOL
 
-    protocol = FFWD.parse_protocol(opts[:protocol] || DEFAULT_PROTOCOL)
+    protocol = FFWD.parse_protocol config[:protocol]
 
-    unless type = OUTPUTS[protocol.family]
-      raise "No type for protocol family: #{protocol.family}"
+    unless handler = OUTPUTS[protocol.family]
+      raise "No handler for protocol family: #{protocol.family}"
     end
 
-    protocol.connect opts, core, log, type
+    protocol.connect config, log, handler
   end
 
-  def self.setup_input opts, core
-    opts[:host] ||= DEFAULT_HOST
-    opts[:port] ||= DEFAULT_PORT
-    protocol = FFWD.parse_protocol(opts[:protocol] || DEFAULT_PROTOCOL)
+  def self.setup_input config
+    config[:host] ||= DEFAULT_HOST
+    config[:port] ||= DEFAULT_PORT
+    config[:protocol] ||= DEFAULT_PROTOCOL
 
-    unless connection = INPUTS[protocol.family]
-      raise "No connection for protocol family: #{protocol.family}"
-    end
-
-    protocol.bind opts, core, log, connection, log
-  end
-
-  def self.setup_tunnel opts, core, tunnel
-    opts[:port] ||= DEFAULT_PORT
-    protocol = FFWD.parse_protocol(opts[: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, log
+    protocol.bind config, log, connection
   end
 end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-riemann
 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: riemann-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !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: 
@@ -83,33 +74,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ffwd/plugin/riemann.rb
-- lib/ffwd/plugin/riemann/shared.rb
-- lib/ffwd/plugin/riemann/version.rb
 - lib/ffwd/plugin/riemann/output.rb
+- lib/ffwd/plugin/riemann/shared.rb
 - lib/ffwd/plugin/riemann/connection.rb
+- lib/ffwd/plugin/riemann/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: Riemann support for FFWD.
 test_files: []