fluent-plugin-keep-forward 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04dd9735323e7d372ac1de93fb8e68388adcb829
-  data.tar.gz: f5d686d0988c06a1872779d52942a87ac7e3c7dd
+  metadata.gz: 75c69e5a185b2fd2c114c9c3956eae071db46ad9
+  data.tar.gz: 1c33c34aaaa7cd4034a2e94f3de1fd579e7dcd70
 SHA512:
-  metadata.gz: 328e26c80f20cfbb506a6b777e7bdac47a927ae3280d24ccd351295941a91c67d48a20c4f5da5cd697ba05027a88723d8ef1ab41018fa7a9d974d5ef7e23ffc8
-  data.tar.gz: d732e0a855fd81d8b5536c2a7aaa9edf9b038e33f5234b0e0af8ccfd38e732c9f2f947b2f8ec205cc07db73f9f537c967a8a8711b3375b2102e5e91dca399845
+  metadata.gz: 30ea2dc8ba742bffa43ab6c7d1df6e97884ad8225fde1a7c7b423d63cccdc76ea9eda70dc3035a71a54b8383d917691446664a374410b49e43c49bc093f4775d
+  data.tar.gz: 1093a335e42d0aa96834807c082b7524c5fd56c61a0d4640939be1d28085576c2b04a252f01b4ef8fefaacb8d9e95e039646a03757a219ff826336d7f90bf63e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.6 (2014/03/28)
+
+Enhancements:
+
+* Add `heartbeat_type none` to disable heartbeat
+
 ## 0.1.4 (2014/03/20)
 
 Fixes

data/README.md

@@ -20,6 +20,11 @@ Following parameters are additionally available:
 
     Keepalive expired time. Default is nil (which means to keep connection as long as possible).
 
+- heartbeat_type
+
+    The transport protocol to use for heartbeats. The default is “udp”, but you can select “tcp” as well. 
+    Furthermore, in keep_forward, you can also select "none" to disable heartbeat.
+
 - keepforward
 
     `one` for keep forwarding all data to the one node.

data/example/fluent.conf

@@ -0,0 +1,39 @@
+<source>
+  type tail
+  path dummy.log
+  pos_file /var/tmp/_var_log_dummy.pos
+  format none
+  tag dummy.localhost
+</source>
+<match dummy.localhost>
+  type copy
+  <store>
+    type stdout
+  </store>
+  <store>
+    type keep_forward
+    flush_interval 0
+    buffer_queue_limit 312
+    buffer_chunk_limit 10m
+    num_threads 1
+    retry_wait 0.1
+    retry_limit 17
+    # max_retry_wait 131072
+    send_timeout 60s # 60s
+    # recover_wait 10s
+    heartbeat_type none # udp
+    # heartbeat_interval 1s
+    phi_threshold 70 # 8
+    hard_timeout 60s # 60s
+    keepalive true
+    <server>
+      host localhost
+      port 10000
+    </server>
+    <server>
+      host localhost
+      port 11000
+      # standby true
+    </server>
+  </store>
+</match>

data/fluent-plugin-keep-forward.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-keep-forward"
-  s.version     = "0.1.4"
+  s.version     = "0.1.6"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-keep-forward"

data/lib/fluent/plugin/out_keep_forward.rb

@@ -18,7 +18,19 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
     when 'tag'
       :tag
     else
-      raise ConfigError, "out_keep_forward keepforward should be 'one' or 'tag'"
+      raise ::Fluent::ConfigError, "out_keep_forward keepforward should be 'one' or 'tag'"
+    end
+  end
+  config_param :heartbeat_type, :default => :udp do |val|
+    case val.downcase
+    when 'tcp'
+      :tcp
+    when 'udp'
+      :udp
+    when 'none' # custom
+      :none
+    else
+      raise ::Fluent::ConfigError, "forward output heartbeat type should be 'tcp' or 'udp', or 'none'"
     end
   end
 
@@ -28,6 +40,10 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
   def configure(conf)
     super
 
+    if @heartbeat_type == :none
+      @nodes = @nodes.map {|node| NonHeartbeatNode.new(node) }
+    end
+
     @node = {}
     @sock = {}
     @sock_expired_at = {}
@@ -53,7 +69,11 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
   end
 
   def shutdown
-    super
+    @finished = true
+    @loop.watchers.each {|w| w.detach }
+    @loop.stop unless @heartbeat_type == :none # custom
+    @thread.join
+    @usock.close if @usock
     stop_watcher
   end
 
@@ -70,6 +90,37 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
     end
   end
 
+  # Override to disable heartbeat
+  def run
+    unless @heartbeat_type == :none
+      super
+    end
+  end
+
+  # Delegate to Node instance disabling heartbeat
+  class NonHeartbeatNode
+    extend Forwardable
+    attr_reader :node
+    def_delegators :@node, :standby?, :resolved_host, :resolve_dns!, :to_msgpack,
+      :name, :host, :port, :weight, :weight=, :standby=, :available=, :sockaddr
+
+    def initialize(node)
+      @node = node
+    end
+
+    def available?
+      true
+    end
+
+    def tick
+      false
+    end
+
+    def heartbeat(detect=true)
+      true
+    end
+  end
+
   # Override
   def write_objects(tag, chunk)
     return if chunk.empty?
@@ -81,9 +132,11 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
         send_data(node, tag, chunk)
         return
       rescue
+        rebuild_weight_array if @heartbeat_type == :none
         weight_send_data(tag, chunk)
       end
     else
+      rebuild_weight_array if @heartbeat_type == :none
       weight_send_data(tag, chunk)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-keep-forward
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -110,6 +110,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- example/fluent.conf
 - fluent-plugin-keep-forward.gemspec
 - lib/fluent/plugin/out_keep_forward.rb
 - spec/out_keep_forward_spec.rb