fluentd 0.10.17 → 0.10.18

data/ChangeLog

@@ -1,4 +1,10 @@
 
+Release 0.10.18 - 2012/04/13
+
+* Use Yajl instead of standard json library to avoid encoding problem
+* buf_memory: call force_encoding('ASCII-8BIT') to avoid encoding problem
+
+
 Release 0.10.17 - 2012/04/02
 
 * in_tail: don't ignore last line without LF [#44]

data/README.rdoc

@@ -45,8 +45,8 @@ An event consists of *tag*, *time* and *record*. Tag is a string separated with
 
   $ gem install fluentd
   $ # install sample configuration file to the directory
-  $ sudo fluentd -s
-  $ fluentd &
+  $ fluentd -s conf
+  $ fluentd -c conf/fluent.conf &
   $ echo '{"json":"message"}' | fluent-cat debug.test
 
 == Meta

data/VERSION

@@ -1 +1 @@
-0.10.17
+0.10.18

data/lib/fluent/command/cat.rb

@@ -84,7 +84,7 @@ end
 require 'thread'
 require 'monitor'
 require 'socket'
-require 'json'
+require 'yajl'
 require 'msgpack'
 
 
@@ -250,7 +250,7 @@ class Writer
   end
 
   def abort_message(time, record)
-    $stdout.puts "!#{time}:#{record.to_json}"
+    $stdout.puts "!#{time}:#{Yajl.dump(record)}"
   end
 end
 
@@ -272,7 +272,7 @@ case format
 when 'json'
   begin
     while line = $stdin.gets
-      record = JSON.parse(line)
+      record = Yajl.load(line)
       w.write(record)
     end
   rescue

data/lib/fluent/load.rb

@@ -5,6 +5,7 @@ require 'monitor'
 require 'stringio'
 require 'fileutils'
 require 'json'
+require 'yajl'
 require 'uri'
 require 'msgpack'
 require 'cool.io'

data/lib/fluent/plugin/buf_memory.rb

@@ -21,10 +21,12 @@ module Fluent
 class MemoryBufferChunk < BufferChunk
   def initialize(key, data='')
     @data = data
+    @data.force_encoding('ASCII-8BIT')
     super(key)
   end
 
   def <<(data)
+    data.force_encoding('ASCII-8BIT')
     @data << data
   end
 

data/lib/fluent/plugin/in_forward.rb

@@ -22,8 +22,6 @@ class ForwardInput < Input
   Plugin.register_input('forward', self)
 
   def initialize
-    require 'socket'
-    require 'yajl'
     super
   end
 

data/lib/fluent/plugin/out_file.rb

@@ -69,7 +69,7 @@ class FileOutput < TimeSlicedOutput
 
   def format(tag, time, record)
     time_str = @timef.format(time)
-    "#{time_str}\t#{tag}\t#{record.to_json}\n"
+    "#{time_str}\t#{tag}\t#{Yajl.dump(record)}\n"
   end
 
   def write(chunk)

data/lib/fluent/plugin/out_stdout.rb

@@ -23,7 +23,7 @@ class StdoutOutput < Output
 
   def emit(tag, es, chain)
     es.each {|time,record|
-      puts "#{Time.at(time).localtime} #{tag}: #{record.to_json}"
+      puts "#{Time.at(time).localtime} #{tag}: #{Yajl.dump(record)}"
     }
     chain.next
   end

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.17'
+VERSION = '0.10.18'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.17
+  version: 0.10.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000Z
+date: 2012-04-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70102411888840 !ruby/object:Gem::Requirement
+  requirement: &70290194123200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70102411888840
+  version_requirements: *70290194123200
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70102411888180 !ruby/object:Gem::Requirement
+  requirement: &70290194122380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70102411888180
+  version_requirements: *70290194122380
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70102411887560 !ruby/object:Gem::Requirement
+  requirement: &70290194121680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102411887560
+  version_requirements: *70290194121680
 - !ruby/object:Gem::Dependency
   name: cool.io
-  requirement: &70102411886940 !ruby/object:Gem::Requirement
+  requirement: &70290194120960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70102411886940
+  version_requirements: *70290194120960
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &70102411886280 !ruby/object:Gem::Requirement
+  requirement: &70290194120180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70102411886280
+  version_requirements: *70290194120180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70102411885660 !ruby/object:Gem::Requirement
+  requirement: &70290194119440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70102411885660
+  version_requirements: *70290194119440
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70102411885040 !ruby/object:Gem::Requirement
+  requirement: &70290194118780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70102411885040
+  version_requirements: *70290194118780
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70102411884420 !ruby/object:Gem::Requirement
+  requirement: &70290194117960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70102411884420
+  version_requirements: *70290194117960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70102411883800 !ruby/object:Gem::Requirement
+  requirement: &70290194117240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70102411883800
+  version_requirements: *70290194117240
 description: 
 email: frsyuki@gmail.com
 executables: