fluentd 0.10.28 → 0.10.29

data/ChangeLog

@@ -1,4 +1,10 @@
 
+Release 0.10.29 - 2012/11/26
+
+* buf_file: added flush_at_shutdown option to force flush before shuttingdown
+* TextParser shows message in warn level if text doesn't match the pattern
+
+
 Release 0.10.28 - 2012/10/30
 
 * in_http: on_request method can get headers as HTTP_* key and remote address

data/VERSION

@@ -1 +1 @@
-0.10.28
+0.10.29

data/lib/fluent/parser.rb

@@ -35,8 +35,7 @@ class TextParser
     def call(text)
       m = @regexp.match(text)
       unless m
-        $log.debug "pattern not match: #{text}"
-        # TODO?
+        $log.warn "pattern not match: #{text.inspect}"
         return nil, nil
       end
 
@@ -85,7 +84,7 @@ class TextParser
 
       return time, record
     rescue Yajl::ParseError
-      # TODO?
+      $log.warn "pattern not match: #{text.inspect}: #{$!}"
       return nil, nil
     end
   end
@@ -156,7 +155,7 @@ class TextParser
     def call(text)
       m = REGEXP.match(text)
       unless m
-        $log.debug "pattern not match: #{text}"
+        $log.warn "pattern not match: #{text.inspect}"
         return nil, nil
       end
 

data/lib/fluent/plugin/buf_file.rb

@@ -95,6 +95,12 @@ class FileBuffer < BasicBuffer
       @buffer_path_prefix = @buffer_path+"."
       @buffer_path_suffix = ".log"
     end
+
+    if flush_at_shutdown = conf['flush_at_shutdown']
+      @flush_at_shutdown = true
+    else
+      @flush_at_shutdown = false
+    end
   end
 
   def start
@@ -162,6 +168,18 @@ class FileBuffer < BasicBuffer
     chunk.mv(npath)
   end
 
+  def before_shutdown(out)
+    if @flush_at_shutdown
+      synchronize do
+        @map.each_key {|key|
+          push(key)
+        }
+        while pop(out)
+        end
+      end
+    end
+  end
+
   protected
   def encode_key(key)
     URI.escape(key, /[^-_.a-zA-Z0-9]/n)

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.28'
+VERSION = '0.10.29'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.28
+  version: 0.10.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack