fluentd 0.10.0 → 0.10.1

data/ChangeLog

@@ -1,4 +1,12 @@
 
+Release 0.10.1 - 2011/10/16
+
+  * SetTimeKeyMixin accepts include_time_key parameter
+  * SetTagKeyMixin accepts include_tag_key parameter
+  * Fixed Makefile.am
+  * Fixed MemoryBufferChunk#msgpack_each
+
+
 Release 0.10.0 - 2011/10/16
 
   * Removed Event class

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.10.1

data/fluentd.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluentd}
-  s.version = "0.10.0"
+  s.version = "0.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sadayuki Furuhashi"]

data/lib/fluent/mixin.rb

@@ -104,40 +104,51 @@ end
 module SetTimeKeyMixin
   include RecordFilterMixin
 
-  def initialize
-    super
-    @time_key = "time"
-    @localtime = true
-  end
-
-  attr_accessor :time_key, :localtime
+  attr_accessor :include_time_key, :time_key, :localtime
 
   def configure(conf)
     super
 
-    if time_key = conf['time_key']
-      @time_key = time_key
-    end
-    unless @time_key
-      @time_key = 'time'
+    if s = conf['include_time_key']
+      b = Config.bool_value(s)
+      if s.empty?
+        b = true
+      elsif b == nil
+        raise ConfigError, "Invalid boolean expression '#{s}' for include_time_key parameter"
+      end
+      @include_time_key = b
     end
 
-    if time_format = conf['time_format']
-      @time_format = time_format
-    end
+    if @include_time_key
+      if time_key = conf['time_key']
+        @time_key = time_key
+      end
+      unless @time_key
+        @time_key = 'time'
+      end
 
-    if localtime = conf['localtime']
-      @localtime = true
-    elsif utc = conf['utc']
-      @localtime = false
-    end
+      if time_format = conf['time_format']
+        @time_format = time_format
+      end
 
-    @timef = TimeFormatter.new(@time_format, @localtime)
+      if localtime = conf['localtime']
+        @localtime = true
+      elsif utc = conf['utc']
+        @localtime = false
+      end
+
+      @timef = TimeFormatter.new(@time_format, @localtime)
+
+    else
+      @include_time_key = false
+    end
   end
 
   def filter_record(tag, time, record)
     super
-    record[@time_key] = @timef.format(time)
+    if @include_time_key
+      record[@time_key] = @timef.format(time)
+    end
   end
 end
 
@@ -145,24 +156,39 @@ end
 module SetTagKeyMixin
   include RecordFilterMixin
 
-  def initialize
-    super
-    @tag_key = "tag"
-  end
-
-  attr_accessor :tag_key
+  attr_accessor :include_tag_key, :tag_key
 
   def configure(conf)
     super
 
-    if tag_key = conf['tag_key']
-      @tag_key = tag_key
+    if s = conf['include_tag_key']
+      b = Config.bool_value(s)
+      if s.empty?
+        b = true
+      elsif b == nil
+        raise ConfigError, "Invalid boolean expression '#{s}' for include_tag_key parameter"
+      end
+      @include_tag_key = b
+    end
+
+    if @include_tag_key
+      if tag_key = conf['tag_key']
+        @tag_key = tag_key
+      end
+      unless @tag_key
+        @tag_key = 'tag'
+      end
+
+    else
+      @include_tag_key = false
     end
   end
 
   def filter_record(tag, time, record)
     super
-    record[@time_key] = @timef.format(time)
+    if @include_tag_key
+      record[@tag_key] = tag
+    end
   end
 end
 

data/lib/fluent/plugin/buf_memory.rb

@@ -53,7 +53,7 @@ class MemoryBufferChunk < BufferChunk
 
   # optimize
   def msgpack_each(&block)
-    u = MessagePack::Unpacker.new(io)
+    u = MessagePack::Unpacker.new
     u.feed_each(@data, &block)
   end
 end

data/lib/fluent/plugin/out_stream.rb

@@ -20,10 +20,9 @@ module Fluent
 
 class StreamOutput < BufferedOutput
   def initialize
-    super
     require 'socket'
     require 'fileutils'
-    @send_timeout = 60
+    super
   end
 
   config_param :send_timeout, :time, :default => 60

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.0'
+VERSION = '0.10.1'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fluentd
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Sadayuki Furuhashi