ffwd 0.1.6 → 0.1.7

data/lib/ffwd/handler.rb

@@ -18,6 +18,8 @@ require_relative 'connection'
 module FFWD
   # Handlers are used by output plugins based of the protocol stack.
   class Handler < FFWD::Connection
+    attr_accessor :parent
+
     def self.new signature, parent, *args
       instance = super(signature, *args)
 
@@ -36,6 +38,7 @@ module FFWD
       @parent.connection_completed
     end
 
+    def close; end
     def send_all events, metrics; end
     def send_event event; end
     def send_metric metric; end

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

@@ -20,6 +20,8 @@ module FFWD::UDP
   class Connect
     include FFWD::Reporter
 
+    RESOLVE_TIMEOUT = 10
+
     attr_reader :reporter_meta, :log
 
     setup_reporter :keys => [
@@ -38,20 +40,21 @@ module FFWD::UDP
       @c = nil
       @peer = "#{host}:#{port}"
       @reporter_meta = {
-        :type => @handler.name, :peer => peer
+        :type => @handler.plugin_type, :peer => @peer
       }
 
       info = "udp://#{@peer}"
 
       subs = []
 
-      r = FFWD.retry :timeout => resolve_timeout do |a|
+      r = FFWD.retry :timeout => RESOLVE_TIMEOUT do |a|
         unless @host_ip
           @host_ip = resolve_ip @host
           raise "Could not resolve: #{@host}" if @host_ip.nil?
         end
 
-        @c = EM.open_datagram_socket(@bind_host, nil)
+        @c = EM.open_datagram_socket(@bind_host, nil, @handler, self)
+
         log.info "Setup of output to #{info} successful"
 
         subs << core.output.event_subscribe{|e| handle_event e}
@@ -74,6 +77,14 @@ module FFWD::UDP
       end
     end
 
+    def send_data data
+      return unless @c
+      @c.send_datagram data, @host_ip, @port
+    end
+
+    def unbind; end
+    def connection_completed; end
+
     private
 
     def handle_event event
@@ -82,8 +93,7 @@ module FFWD::UDP
         return
       end
 
-      data = @handler.serialize_event event
-      @c.send_datagram data, @host_ip, @port
+      @c.send_event event
       increment :sent_events, 1
     end
 
@@ -93,8 +103,7 @@ module FFWD::UDP
         return
       end
 
-      data = @handler.serialize_metric metric
-      @c.send_datagram data, @host_ip, @port
+      @c.send_metric metric
       increment :sent_metrics, 1
     end
 

data/lib/ffwd/version.rb

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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ffwd
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
+  prerelease: 
 platform: ruby
 authors:
 - John-John Tedro
@@ -9,62 +10,70 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   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: 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'
 - !ruby/object:Gem::Dependency
   name: autoversion
   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: 
@@ -77,88 +86,89 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/fwc
 - bin/ffwd
-- lib/fwc.rb
-- lib/ffwd.rb
-- lib/ffwd/statistics.rb
-- lib/ffwd/processor.rb
+- bin/fwc
 - lib/ffwd/producing_client.rb
-- lib/ffwd/tunnel.rb
-- lib/ffwd/protocol.rb
+- lib/ffwd/tunnel/udp.rb
+- lib/ffwd/tunnel/plugin.rb
+- lib/ffwd/tunnel/tcp.rb
 - lib/ffwd/lifecycle.rb
-- lib/ffwd/debug/tcp.rb
-- lib/ffwd/debug/connection.rb
-- lib/ffwd/debug/monitor_session.rb
-- lib/ffwd/channel.rb
-- lib/ffwd/plugin/json.rb
-- lib/ffwd/plugin/log/writer.rb
-- lib/ffwd/plugin/log.rb
-- lib/ffwd/plugin/json/connection.rb
-- lib/ffwd/circular_buffer.rb
-- lib/ffwd/event.rb
-- lib/ffwd/statistics/system_statistics.rb
+- lib/ffwd/logging.rb
+- lib/ffwd/metric.rb
+- lib/ffwd/schema.rb
+- lib/ffwd/version.rb
 - lib/ffwd/statistics/collector.rb
-- lib/ffwd/connection.rb
+- lib/ffwd/statistics/system_statistics.rb
 - lib/ffwd/utils.rb
-- lib/ffwd/protocol/tcp.rb
+- lib/ffwd/protocol/udp.rb
 - lib/ffwd/protocol/tcp/bind.rb
-- lib/ffwd/protocol/tcp/plain_connect.rb
 - lib/ffwd/protocol/tcp/flushing_connect.rb
+- lib/ffwd/protocol/tcp/plain_connect.rb
 - lib/ffwd/protocol/tcp/connection.rb
+- lib/ffwd/protocol/tcp.rb
 - lib/ffwd/protocol/udp/bind.rb
 - lib/ffwd/protocol/udp/connect.rb
-- lib/ffwd/protocol/udp.rb
-- lib/ffwd/reporter.rb
-- lib/ffwd/plugin_loader.rb
-- lib/ffwd/schema/spotify100.rb
-- lib/ffwd/schema/default.rb
-- lib/ffwd/metric_emitter.rb
-- lib/ffwd/schema.rb
-- lib/ffwd/event_emitter.rb
-- lib/ffwd/core/processor.rb
+- lib/ffwd/plugin/log/writer.rb
+- lib/ffwd/plugin/log.rb
+- lib/ffwd/plugin/json.rb
+- lib/ffwd/plugin/json/connection.rb
+- lib/ffwd/handler.rb
+- lib/ffwd/protocol.rb
+- lib/ffwd/plugin.rb
+- lib/ffwd/debug.rb
+- lib/ffwd/event.rb
+- lib/ffwd/processor.rb
+- lib/ffwd/debug/monitor_session.rb
+- lib/ffwd/debug/tcp.rb
+- lib/ffwd/debug/connection.rb
+- lib/ffwd/channel.rb
+- lib/ffwd/circular_buffer.rb
 - lib/ffwd/core/interface.rb
-- lib/ffwd/core/reporter.rb
 - lib/ffwd/core/emitter.rb
-- lib/ffwd/handler.rb
-- lib/ffwd/version.rb
+- lib/ffwd/core/processor.rb
+- lib/ffwd/core/reporter.rb
 - lib/ffwd/core.rb
-- lib/ffwd/processor/rate.rb
+- lib/ffwd/plugin_channel.rb
+- lib/ffwd/plugin_loader.rb
+- lib/ffwd/reporter.rb
+- lib/ffwd/metric_emitter.rb
+- lib/ffwd/statistics.rb
+- lib/ffwd/schema/spotify100.rb
+- lib/ffwd/schema/default.rb
+- lib/ffwd/retrier.rb
+- lib/ffwd/tunnel.rb
 - lib/ffwd/processor/count.rb
 - lib/ffwd/processor/histogram.rb
-- lib/ffwd/debug.rb
-- lib/ffwd/retrier.rb
-- lib/ffwd/logging.rb
-- lib/ffwd/plugin_channel.rb
-- lib/ffwd/tunnel/tcp.rb
-- lib/ffwd/tunnel/udp.rb
-- lib/ffwd/tunnel/plugin.rb
-- lib/ffwd/plugin.rb
-- lib/ffwd/metric.rb
+- lib/ffwd/processor/rate.rb
+- lib/ffwd/event_emitter.rb
+- lib/ffwd/connection.rb
+- lib/ffwd.rb
 - lib/em/protocols/frame_object_protocol.rb
 - lib/em/all.rb
+- lib/fwc.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: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Core framework for the FastForward Daemon.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 51775a59c73dd9be7d21c447c82b07114e9d8873
-  data.tar.gz: 0ea15ca035581520ede8c982abba0b91693b9faf
-SHA512:
-  metadata.gz: 0eed13b83347cf1bec2d5b31b1a3a91d453d7108dc04a1f7e86910ec1751fb31f9b82f92343a8a25728a0c8da63740e36bfb8b1a488d7d42d95d2762fa29b410
-  data.tar.gz: de52f3fa7891f164f457683cd5536f07c5ed9a1ffe098198605a3a8c51660966c19ddc0adb8037472d03ff645b0230fc97f132f2fe9c64b6c9acd88a7e6a699c