ffwd 0.1.7 → 0.2.0

data/lib/ffwd/schema.rb

@@ -22,9 +22,16 @@ module FFWD
   DEFUALT_SCHEMA = 'default'
   DEFAULT_CONTENT_TYPE = 'application/json'
 
-  def self.parse_schema opts, support=SCHEMA_DEFAULT_SUPPORT
-    name = opts[:schema] || DEFUALT_SCHEMA
-    content_type = opts[:content_type] || DEFAULT_CONTENT_TYPE
+  def self.prepare_schema config
+    config[:schema] ||= DEFUALT_SCHEMA
+    config[:content_type] ||= DEFAULT_CONTENT_TYPE
+    config
+  end
+
+  def self.parse_schema config, support=SCHEMA_DEFAULT_SUPPORT
+    name = config[:schema]
+    content_type = config[:content_type]
+
     key = [name, content_type]
 
     schema = FFWD::Schema.loaded[key]

data/lib/ffwd/statistics/collector.rb

@@ -14,16 +14,28 @@
 # the License.
 
 require_relative '../lifecycle'
+require_relative '../logging'
 
 require_relative 'system_statistics'
 
 module FFWD::Statistics
   class Collector
     include FFWD::Lifecycle
+    include FFWD::Logging
 
     DEFAULT_PERIOD = 10
     DEFAULT_PREFIX = "ffwd"
 
+    def self.build emitter, channel, opts={}
+      opts[:period] ||= DEFAULT_PERIOD
+      opts[:prefix] ||= DEFAULT_PREFIX
+      opts[:tags] ||= []
+      opts[:attributes] ||= {}
+      system = SystemStatistics.new(opts[:system] || {})
+      system = if system.check then system end
+      new emitter, channel, system, opts
+    end
+
     # Initialize the statistics collector.
     #
     # emitter - The emitter used to dispatch metrics for all reporters and
@@ -31,27 +43,19 @@ module FFWD::Statistics
     # channel - A side-channel used by the SystemStatistics component
     # to report information about the system. Messages sent on this channel
     # help Core decide if it should seppuku.
-    def initialize log, emitter, channel, opts={}
+    def initialize emitter, channel, system, opts
       @emitter = emitter
-      @period = opts[:period] || DEFAULT_PERIOD
-      @tags = opts[:tags] || []
-      @attributes = opts[:attributes] || {}
-      @reporters = {}
       @channel = channel
-      @timer = nil
-      @prefix = opts[:prefix] || DEFAULT_PREFIX
+      @system = system
+      @period = opts[:period]
+      @prefix = opts[:prefix]
+      @tags = opts[:tags]
+      @attributes = opts[:attributes]
 
-      system = SystemStatistics.new(opts[:system] || {})
-
-      if system.check
-        @system = system
-      else
-        @system = nil
-      end
+      @reporters = {}
+      @timer = nil
 
       starting do
-        log.info "Started statistics collection"
-
         @last = Time.now
 
         @timer = EM::PeriodicTimer.new @period do
@@ -59,15 +63,17 @@ module FFWD::Statistics
           generate! @last, now
           @last = now
         end
+
+        log.info "Started #{opts.inspect}"
       end
 
       stopping do
-        log.info "Stopped statistics collection"
-
         if @timer
           @timer.cancel
           @timer = nil
         end
+
+        log.info "Stopped"
       end
     end
 
@@ -92,12 +98,14 @@ module FFWD::Statistics
       end
     end
 
-    def register id, reporter
-      @reporters[id] = reporter
-    end
+    def register lifecycle, id, reporter
+      lifecycle.starting do
+        @reporters[id] = reporter
+      end
 
-    def unregister id
-      @reporters.delete id
+      lifecycle.stopping do
+        @reporters.delete id
+      end
     end
   end
 end

data/lib/ffwd/test/protocol.rb

@@ -0,0 +1,42 @@
+# $LICENSE
+# Copyright 2013-2014 Spotify AB. All rights reserved.
+#
+# The contents of this file are licensed under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require 'ffwd/handler'
+require 'ffwd/connection'
+
+module FFWD::Test
+  module Protocol
+    def valid_output klass, opts={}
+      expect(klass < FFWD::Handler).to be true
+      sig = double
+      connect = double
+      config = opts[:config] || double
+      expect(klass.respond_to?(:plugin_type)).to be true
+      expect(klass.plugin_type.nil?).to be false
+      return klass.new sig, connect, config
+    end
+
+    def valid_input klass, opts={}
+      expect(klass < FFWD::Connection).to be true
+      sig = double
+      bind = double
+      core = double
+      config = opts[:config] || double
+      expect(klass.respond_to?(:plugin_type)).to be true
+      expect(klass.plugin_type.nil?).to be false
+      return klass.new sig, bind, core, config
+    end
+  end
+end

data/lib/ffwd/tunnel/tcp.rb

@@ -50,10 +50,12 @@ module FFWD::Tunnel
             instance.unbind
           end
         end
+
+        @log.info "Tunneling tcp/#{@port}"
       end
 
       stopping do
-        log.info "Stopped tunneling tcp/#{@port}"
+        @log.info "Stopped tunneling tcp/#{@port}"
       end
     end
   end

data/lib/ffwd/utils.rb

@@ -47,4 +47,11 @@ module FFWD
   def self.dump2hex data
     data.bytes.map { |byte| byte.to_s(16) }.join
   end
+
+  def self.check_ignored v
+    v = v.to_s
+    return :metrics if v.downcase == "metrics"
+    return :events if v.downcase == "events"
+    raise "Invalid ignore kind '#{v}', should be one of: 'metrics' or 'events'"
+  end
 end

data/lib/ffwd/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffwd
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - John-John Tedro
@@ -10,70 +9,62 @@ authors:
 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: 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: 
@@ -86,89 +77,86 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/ffwd
 - bin/fwc
+- bin/ffwd
+- lib/fwc.rb
+- lib/ffwd.rb
+- lib/ffwd/processor.rb
 - lib/ffwd/producing_client.rb
-- lib/ffwd/tunnel/udp.rb
-- lib/ffwd/tunnel/plugin.rb
-- lib/ffwd/tunnel/tcp.rb
+- lib/ffwd/protocol.rb
 - lib/ffwd/lifecycle.rb
-- lib/ffwd/logging.rb
-- lib/ffwd/metric.rb
-- lib/ffwd/schema.rb
-- lib/ffwd/version.rb
-- lib/ffwd/statistics/collector.rb
+- lib/ffwd/debug/tcp.rb
+- lib/ffwd/debug/connection.rb
+- lib/ffwd/debug/monitor_session.rb
+- lib/ffwd/channel.rb
+- lib/ffwd/test/protocol.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/event.rb
 - lib/ffwd/statistics/system_statistics.rb
+- lib/ffwd/statistics/collector.rb
+- lib/ffwd/connection.rb
 - lib/ffwd/utils.rb
-- lib/ffwd/protocol/udp.rb
+- lib/ffwd/protocol/tcp.rb
 - lib/ffwd/protocol/tcp/bind.rb
-- lib/ffwd/protocol/tcp/flushing_connect.rb
 - lib/ffwd/protocol/tcp/plain_connect.rb
+- lib/ffwd/protocol/tcp/flushing_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/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/emitter.rb
-- lib/ffwd/core/processor.rb
-- lib/ffwd/core/reporter.rb
-- lib/ffwd/core.rb
-- lib/ffwd/plugin_channel.rb
-- lib/ffwd/plugin_loader.rb
+- lib/ffwd/protocol/udp.rb
 - lib/ffwd/reporter.rb
-- lib/ffwd/metric_emitter.rb
-- lib/ffwd/statistics.rb
+- lib/ffwd/plugin_loader.rb
 - lib/ffwd/schema/spotify100.rb
 - lib/ffwd/schema/default.rb
-- lib/ffwd/retrier.rb
-- lib/ffwd/tunnel.rb
+- lib/ffwd/metric_emitter.rb
+- lib/ffwd/schema.rb
+- lib/ffwd/event_emitter.rb
+- lib/ffwd/core/processor.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.rb
+- lib/ffwd/processor/rate.rb
 - lib/ffwd/processor/count.rb
 - lib/ffwd/processor/histogram.rb
-- lib/ffwd/processor/rate.rb
-- lib/ffwd/event_emitter.rb
-- lib/ffwd/connection.rb
-- lib/ffwd.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/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: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Core framework for the FastForward Daemon.
 test_files: []

data/lib/ffwd/circular_buffer.rb

@@ -1,78 +0,0 @@
-# $LICENSE
-# Copyright 2013-2014 Spotify AB. All rights reserved.
-#
-# The contents of this file are licensed under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-Node = Struct.new(:value, :next)
-
-module FFWD
-  class CircularBuffer
-    attr_reader :buffer, :capacity, :size
-
-    def initialize capacity
-      @capacity = capacity
-      @first = nil
-      @last = nil
-      @size = 0
-    end
-
-    def clear
-      @first = nil
-      @last = nil
-      @size = 0
-    end
-
-    def empty?
-      size == 0
-    end
-
-    def peek
-      return nil if @first.nil?
-      @first.value
-    end
-
-    def shift
-      return nil if @first.nil?
-      value = @first.value
-      @first = @first.next
-      @last = nil if @first.nil?
-      @size -= 1
-      value
-    end
-
-    def << item
-      node = Node.new(item, nil)
-
-      if @last.nil?
-        @first = @last = node
-      else
-        @last = @last.next = node
-      end
-
-      if @size >= @capacity
-        @first = @first.next
-      else
-        @size += 1
-      end
-    end
-
-    def each
-      current = @first
-
-      while not current.nil?
-        yield current.value
-        current = current.next
-      end
-    end
-  end
-end