fluentd 0.10.51 → 0.10.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0d7335ca94183ce7a33d7578b88addeb64b1c8f
-  data.tar.gz: 77807fdc964ab88d09ecc41787339c0825dba08c
+  metadata.gz: 6871e2cbaea0e7068a4671988446b2cbbf8d5efb
+  data.tar.gz: 7ec21b7f21fa8787b7a577894849df0ea5acf22b
 SHA512:
-  metadata.gz: d3d90bcc098a60fc5525960445b25e6e5aea09f4221be6cbb943b8d656a34bb89ffdbfdad89a645394c85d953fd9577f2ec359f37f90c66520e658cb5c4f8d6a
-  data.tar.gz: a5759301599ea3243f1cb0021910ad411145cb524312d9d653be7bf94aeba6866eab42515c9dc77cb7279743f73290652c312feba6682113e57720b1951eca40
+  metadata.gz: 924081ce1193ab72e08f05bc9ab758716d2aea3d988b1c2f735781eda2432acc78c5fea0bf40032aedc54f72067a5a39784e23cb9fa3a15ac4064792aff45dc7
+  data.tar.gz: 726dbda087652aa3c88f17f3a7f6dcd34d4dc7dab5a576efbf08883f10256f3e2ee3fa0bae375a69a3f769fd47deb36f22bb256f6defbd607f1bd6596649dc1c

data/.gitignore

@@ -17,4 +17,5 @@ fluent-gem
 fluentd
 pkg/*
 test/tmp/*
+spec/config/tmp/*
 make_dist.sh

data/ChangeLog

@@ -1,3 +1,14 @@
+Release 0.10.52 - 2014/07/15
+
+* in_tail: Fix typo of warning argument. lb to line
+* config: Fix 'uninitialized constant Fluent::Config::V1Parser::URI' error
+* config: Reject '@' prefix of parameter name in V1 configuration. @ is reserved prefix.
+* config; Accept '#' comment in array and hash types
+* parser: Add time_format option to SyslogParser
+* parser: SyslogParser now makes ':' optional after pid
+* process: Fix 'mutex can't lock' issue of DetachMultiProcessMixin on Ruby 2.x
+* Add --without-source option to ignore <source> sections
+
 Release 0.10.51 - 2014/07/04
 
 * in_tail: Fix rotation handling when new file not found

data/fluentd.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
 
   gem.authors       = ["Sadayuki Furuhashi"]
   gem.email         = ["frsyuki@gmail.com"]
-  gem.description   = %q{Fluentd is an event collector system. It is a generalized version of syslogd, which handles JSON objects for its log messages}
+  gem.description   = %q{Fluentd is an open source data collector designed to scale and simplify log management. It can collect, process and ship many kinds of data in near real-time.}
   gem.summary       = %q{Fluentd event collector}
   gem.homepage      = "http://fluentd.org/"
 

data/lib/fluent/command/fluentd.rb

@@ -17,10 +17,7 @@
 #
 
 require 'optparse'
-require 'fluent/log'
-require 'fluent/env'
 require 'fluent/supervisor'
-require 'fluent/version'
 
 op = OptionParser.new
 op.version = Fluent::VERSION
@@ -79,6 +76,10 @@ op.on('--suppress-repeated-stacktrace', "suppress repeated stacktrace", TrueClas
   opts[:suppress_repeated_stacktrace] = b
 }
 
+op.on('--without-source', "invoke a fluentd without input plugins", TrueClass) {|b|
+  opts[:without_source] = b
+}
+
 op.on('--use-v1-config', "Use v1 configuration format", TrueClass) {|b|
   opts[:use_v1_config] = b
 }
@@ -156,6 +157,4 @@ if setup_path = opts[:setup_path]
   exit 0
 end
 
-require 'fluent/supervisor'
 Fluent::Supervisor.new(opts).start
-

data/lib/fluent/config/element.rb

@@ -22,6 +22,19 @@ module Fluent
         e
       end
 
+      def inspect
+        attrs = super
+        "name:#{@name}, arg:#{@arg}, " + attrs + ", " + @elements.inspect
+      end
+
+      def ==(o)
+        self.name == o.name && self.arg == o.arg &&
+          self.keys.size == o.keys.size &&
+          self.keys.reduce(true){|r, k| r && self[k] == o[k] } &&
+          self.elements.size == o.elements.size &&
+          [self.elements, o.elements].transpose.reduce(true){|r, e| r && e[0] == e[1] }
+      end
+
       def +(o)
         Element.new(@name.dup, @arg.dup, o.merge(self), @elements + o.elements, (@unused + o.unused).uniq)
       end

data/lib/fluent/config/literal_parser.rb

@@ -139,19 +139,61 @@ module Fluent
 
       def scan_json(is_array)
         result = nil
+        # Yajl does not raise ParseError for imcomplete json string, like '[1', '{"h"', '{"h":' or '{"h1":1'
+        # This is the reason to use JSON module.
+
+        buffer = (is_array ? "[" : "{")
+        line_buffer = ""
 
-        y = Yajl::Parser.new(:allow_comments => true)
-        y.on_parse_complete = Proc.new { |obj| result = obj }
-        y << (is_array ? '[' : '{')
         until result
-          ch = getch
-          parse_error! "got incomplete #{is_array ? 'array' : 'hash'} configuration" if ch.nil?
-          y << ch
+          char = getch
+
+          break if char.nil?
+
+          if char == "#"
+            # If this is out of json string literals, this object can be parsed correctly
+            # '{"foo":"bar", #' -> '{"foo":"bar"}' (to check)
+            parsed = nil
+            begin
+              parsed = JSON.parse(buffer + line_buffer.rstrip.sub(/,$/, '') + (is_array ? "]" : "}"))
+            rescue JSON::ParserError => e
+              # This '#' is in json string literals
+            end
+
+            if parsed
+              # ignore chars as comment before newline
+              while (char = getch) != "\n"
+                # ignore comment char
+              end
+              buffer << line_buffer + "\n"
+              line_buffer = ""
+            else
+              # '#' is a char in json string
+              line_buffer << char
+            end
+
+            next # This char '#' MUST NOT terminate json object.
+          end
+
+          if char == "\n"
+            buffer << line_buffer + "\n"
+            line_buffer = ""
+            next
+          end
+
+          line_buffer << char
+          begin
+            result = JSON.parse(buffer + line_buffer)
+          rescue JSON::ParserError => e
+            # Incomplete json string yet
+          end
+        end
+
+        unless result
+          parse_error! "got incomplete #{is_array ? 'array' : 'hash'} configuration"
         end
 
-        Yajl.dump(result) # Convert json to string for config_param
-      rescue Yajl::ParseError => e
-        parse_error! "unexpected #{is_array ? 'array' : 'hash'} parse error"
+        JSON.dump(result)
       end
     end
   end

data/lib/fluent/config/v1_parser.rb

@@ -103,6 +103,10 @@ module Fluent
               if k == '@include'
                 parse_include(attrs, elems)
               else
+                if k.start_with?('@')
+                  parse_error! "'@' is reserved prefix. Don't use '@' in parameter name"
+                end
+
                 v = parse_literal
                 unless line_end
                   parse_error! "expected end of line"

data/lib/fluent/engine.rb

@@ -35,6 +35,7 @@ module Fluent
       @next_emit_error_log_time = nil
 
       @suppress_config_dump = false
+      @without_source = false
     end
 
     MATCH_CACHE_SIZE = 1024
@@ -43,13 +44,18 @@ module Fluent
 
     attr_reader :matches, :sources
 
-    def init
+    def init(opts = {})
       BasicSocket.do_not_reverse_lookup = true
       Plugin.load_plugins
       if defined?(Encoding)
         Encoding.default_internal = 'ASCII-8BIT' if Encoding.respond_to?(:default_internal)
         Encoding.default_external = 'ASCII-8BIT' if Encoding.respond_to?(:default_external)
       end
+
+      suppress_interval(opts[:suppress_interval]) if opts[:suppress_interval]
+      @suppress_config_dump = opts[:suppress_config_dump] if opts[:suppress_config_dump]
+      @without_source = opts[:without_source] if opts[:without_source]
+
       self
     end
 
@@ -58,10 +64,6 @@ module Fluent
       @next_emit_error_log_time = Time.now.to_i
     end
 
-    def suppress_config_dump=(flag)
-      @suppress_config_dump = flag
-    end
-
     def parse_config(io, fname, basepath = Dir.pwd, v1_config = false)
       if fname =~ /\.rb$/
         require 'fluent/config/dsl'
@@ -74,7 +76,11 @@ module Fluent
     def run_configure(conf)
       configure(conf)
       conf.check_not_fetched { |key, e|
-        $log.warn "parameter '#{key}' in #{e.to_s.strip} is not used." unless e.name == 'system'
+        unless e.name == 'system'
+          unless @without_source && e.name == 'source'
+            $log.warn "parameter '#{key}' in #{e.to_s.strip} is not used."
+          end
+        end
       }
     end
 
@@ -88,20 +94,24 @@ module Fluent
         $log.info "using configuration file: #{conf.to_s.rstrip}"
       end
 
-      conf.elements.select {|e|
-        e.name == 'source'
-      }.each {|e|
-        type = e['type']
-        unless type
-          raise ConfigError, "Missing 'type' parameter on <source> directive"
-        end
-        $log.info "adding source type=#{type.dump}"
+      if @without_source
+        $log.info "'--without-source' is applied. Ignore <source> sections"
+      else
+        conf.elements.select {|e|
+          e.name == 'source'
+        }.each {|e|
+          type = e['type']
+          unless type
+            raise ConfigError, "Missing 'type' parameter on <source> directive"
+          end
+          $log.info "adding source type=#{type.dump}"
 
-        input = Plugin.new_input(type)
-        input.configure(e)
+          input = Plugin.new_input(type)
+          input.configure(e)
 
-        @sources << input
-      }
+          @sources << input
+        }
+      end
 
       conf.elements.select {|e|
         e.name == 'match'

data/lib/fluent/parser.rb

@@ -471,11 +471,11 @@ module Fluent
       include Configurable
 
       # From existence TextParser pattern
-      REGEXP = /^(?<time>[^ ]*\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?[^\:]*\: *(?<message>.*)$/
+      REGEXP = /^(?<time>[^ ]*\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$/
       # From in_syslog default pattern
-      REGEXP_WITH_PRI = /^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?[^\:]*\: *(?<message>.*)$/
-      TIME_FORMAT = "%b %d %H:%M:%S"
+      REGEXP_WITH_PRI = /^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$/
 
+      config_param :time_format, :string, :default => "%b %d %H:%M:%S"
       config_param :with_priority, :bool, :default => false
 
       attr_accessor :estimate_current_event
@@ -483,7 +483,6 @@ module Fluent
       def initialize
         super
         @estimate_current_event = true
-        @time_parser = TextParser::TimeParser.new(TIME_FORMAT)
         @mutex = Mutex.new
       end
 
@@ -491,10 +490,11 @@ module Fluent
         super
 
         @regexp = @with_priority ? REGEXP_WITH_PRI : REGEXP
+        @time_parser = TextParser::TimeParser.new(@time_format)
       end
 
       def patterns
-        {'format' => @regexp, 'time_format' => TIME_FORMAT}
+        {'format' => @regexp, 'time_format' => @time_format}
       end
 
       def call(text)

data/lib/fluent/plugin/in_tail.rb

@@ -267,7 +267,7 @@ module Fluent
             lb = line
           else
             if lb.nil?
-              log.warn "got incomplete line before first line from #{tail_watcher.path}: #{lb.inspect}"
+              log.warn "got incomplete line before first line from #{tail_watcher.path}: #{line.inspect}"
             else
               lb << line
             end

data/lib/fluent/process.rb

@@ -378,9 +378,12 @@ module Fluent
       def stop
         return if @finished
         @finished = true
-        @mutex.synchronize do
-          @cond.broadcast
-        end
+        # Creating new thread due to mutex can't lock in main thread during trap context
+        Thread.new {
+          @mutex.synchronize do
+            @cond.broadcast
+          end
+        }.run
       end
 
       def finished?

data/lib/fluent/supervisor.rb

@@ -16,9 +16,7 @@
 #    limitations under the License.
 #
 
-require 'fluent/env'
-require 'fluent/log'
-require 'fluent/config'
+require 'fluent/load'
 require 'etc'
 
 module Fluent
@@ -61,7 +59,6 @@ module Fluent
         end
 
         $log = Fluent::Log.new(@io, @level, @opts)
-
         $log.enable_color(false) if @path
         $log.enable_debug if @level <= Fluent::Log::LEVEL_DEBUG
       end
@@ -91,6 +88,7 @@ module Fluent
         :chgroup => nil,
         :suppress_interval => 0,
         :suppress_repeated_stacktrace => false,
+        :without_source => false,
         :use_v1_config => false,
       }
     end
@@ -112,6 +110,7 @@ module Fluent
       @log_level = opt[:log_level]
       @suppress_interval = opt[:suppress_interval]
       @suppress_config_dump = opt[:suppress_config_dump]
+      @without_source = opt[:without_source]
 
       log_opts = {:suppress_repeated_stacktrace => opt[:suppress_repeated_stacktrace]}
       @log = LoggerInitializer.new(@log_path, @log_level, @chuser, @chgroup, log_opts)
@@ -120,7 +119,6 @@ module Fluent
     end
 
     def start
-      require 'fluent/load'
       @log.init
 
       dry_run if @dry_run
@@ -321,9 +319,8 @@ module Fluent
       end
     end
 
-    # with_log is for disabling logging before Log#init is called
-    def read_config(with_log = true)
-      $log.info "reading config file", :path => @config_path if with_log
+    def read_config
+      $log.info "reading config file", :path => @config_path
       @config_fname = File.basename(@config_path)
       @config_basedir = File.dirname(@config_path)
       @config_data = File.read(@config_path)
@@ -343,6 +340,7 @@ module Fluent
       config_param :suppress_repeated_stacktrace, :bool, :default => nil
       config_param :emit_error_log_interval, :time, :default => nil
       config_param :suppress_config_dump, :bool, :default => nil
+      config_param :without_source, :bool, :default => nil
 
       def initialize(conf)
         super()
@@ -355,12 +353,16 @@ module Fluent
         opt[:suppress_interval] = @emit_error_log_interval unless @emit_error_log_interval.nil?
         opt[:suppress_config_dump] = @suppress_config_dump unless @suppress_config_dump.nil?
         opt[:suppress_repeated_stacktrace] = @suppress_repeated_stacktrace unless @suppress_repeated_stacktrace.nil?
+        opt[:without_source] = @without_source unless @without_source.nil?
         opt
       end
     end
 
     def apply_system_config(opt)
-      read_config(false)
+      # Create NULL file to avoid $log uninitialized problem before call @log.init
+      file = File.open(File::NULL)
+      $log = Fluent::Log.new(file, Log::LEVEL_INFO)
+      read_config
       systems = Fluent::Config.parse(@config_data, @config_fname, @config_basedir, @use_v1_config).elements.select { |e|
         e.name == 'system'
       }
@@ -368,6 +370,8 @@ module Fluent
       raise ConfigError, "<system> is duplicated. <system> should be only one" if systems.size > 1
 
       opt.merge!(SystemConfig.new(systems.first).to_opt)
+    ensure
+      file.close
     end
 
     def run_configure
@@ -393,13 +397,8 @@ module Fluent
     end
 
     def init_engine
-      require 'fluent/load'
-      Fluent::Engine.init
-      if @suppress_interval
-        Fluent::Engine.suppress_interval(@suppress_interval)
-      end
-
-      Fluent::Engine.suppress_config_dump = @suppress_config_dump
+      init_opts = {:suppress_interval => @suppress_interval, :suppress_config_dump => @suppress_config_dump, :without_source => @without_source}
+      Fluent::Engine.init(init_opts)
 
       @libs.each {|lib|
         require lib

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-  VERSION = '0.10.51'
+  VERSION = '0.10.52'
 
 end

data/spec/config/config_parser_spec.rb

@@ -37,49 +37,53 @@ describe Fluent::Config::V1Parser do
       expect(%[
         k1 v1
         k2 v2
-      ]).to be_parsed_as("k1"=>"v1", "k2"=>"v2")
+      ]).to be_parsed_as(e('ROOT', '', {"k1"=>"v1", "k2"=>"v2"}))
     end
 
     it "allows attribute without value" do
       expect(%[
         k1
         k2 v2
-      ]).to be_parsed_as("k1"=>"", "k2"=>"v2")
+      ]).to be_parsed_as(e('ROOT', '', {"k1"=>"", "k2"=>"v2"}))
     end
 
     it "parses attribute key always string" do
-      expect("1 1").to be_parsed_as("1" => "1")
+      expect("1 1").to be_parsed_as(e('ROOT', '', {"1" => "1"}))
     end
 
     [
       "_.%$!,",
-      "/=~-~@`:?",
+      "/=~-~@\`:?",
       "()*{}.[]",
     ].each do |v|
       it "parses a value with symbol #{v.inspect}" do
-        expect("k #{v}").to be_parsed_as("k" => v)
+        expect("k #{v}").to be_parsed_as(e('ROOT', '', {"k" => v}))
       end
     end
 
     it "ignores spacing around value" do
-      expect("  k1     a    ").to be_parsed_as("k1" => "a")
+      expect("  k1     a    ").to be_parsed_as(e('ROOT', '', {"k1" => "a"}))
     end
 
     it "allows spaces in value" do
-      expect("k1 a  b  c").to be_parsed_as("k1" => "a  b  c")
+      expect("k1 a  b  c").to be_parsed_as(e('ROOT', '', {"k1" => "a  b  c"}))
     end
 
     it "ignores comments after value" do
-      expect("  k1 a#comment").to be_parsed_as("k1" => "a")
+      expect("  k1 a#comment").to be_parsed_as(e('ROOT', '', {"k1" => "a"}))
     end
 
     it "allows # in value if quoted" do
-      expect('  k1 "a#comment"').to be_parsed_as("k1" => "a#comment")
+      expect('  k1 "a#comment"').to be_parsed_as(e('ROOT', '', {"k1" => "a#comment"}))
     end
 
     it "rejects characters after quoted string" do
       expect('  k1 "a" 1').to be_parse_error
     end
+
+    it "rejects @ prefix in parameter name" do
+      expect('  @k v').to be_parse_error
+    end
   end
 
   describe 'element parsing' do
@@ -118,13 +122,25 @@ describe Fluent::Config::V1Parser do
           </nested2>
         </test>
       ]).to be_parsed_as(root(
-          e("test", 'var', {'key'=>'val'}, [
+          e("test", 'var', {'key'=>'1'}, [
             e('nested1'),
             e('nested2')
           ])
         ))
     end
 
+    it "accepts multiline json values" do
+      expect(%[
+        <test var>
+          key ["a",
+"b", "c",
+"d"]
+        </test>
+      ]).to be_parsed_as(root(
+          e("test", 'var', {'key'=>"[\"a\",\"b\",\"c\",\"d\"]"})
+      ))
+    end
+
     [
       "**",
       "*.*",
@@ -148,7 +164,7 @@ describe Fluent::Config::V1Parser do
         <test >
         </test>
       ]).to be_parsed_as(root(
-          e("test", nil)
+          e("test", '')
         ))
     end
 

data/spec/config/helper.rb

@@ -47,4 +47,3 @@ shared_context 'config_helper' do
     end
   end
 end
-

data/spec/config/literal_parser_spec.rb

@@ -172,6 +172,30 @@ describe Fluent::Config::LiteralParser do
     it { expect('[ "a" , "b" ]').to be_parsed_as_json(["a","b"]) }
     it { expect("[\n\"a\"\n,\n\"b\"\n]").to be_parsed_as_json(["a","b"]) }
     it { expect('["ab","cd"]').to be_parsed_as_json(["ab","cd"]) }
+    json_array_with_js_comment = <<EOA
+[
+ "a", // this is a
+ "b", // this is b
+ "c"  // this is c
+]
+EOA
+    it { expect(json_array_with_js_comment).to be_parsed_as_json(["a","b","c"]) }
+    json_array_with_comment = <<EOA
+[
+ "a", # this is a
+ "b", # this is b
+ "c"  # this is c
+]
+EOA
+    it { expect(json_array_with_comment).to be_parsed_as_json(["a","b","c"]) }
+    json_array_with_tailing_comma = <<EOA
+[
+ "a", # this is a
+ "b", # this is b
+ "c", # this is c
+]
+EOA
+    it { expect(json_array_with_tailing_comma).to be_parse_error }
   end
 
   describe 'map parsing' do
@@ -185,6 +209,14 @@ describe Fluent::Config::LiteralParser do
     it { expect('{"a":"b","c":"d"}').to be_parsed_as_json({"a"=>"b","c"=>"d"}) }
     it { expect('{ "a" : "b" , "c" : "d" }').to be_parsed_as_json({"a"=>"b","c"=>"d"}) }
     it { expect("{\n\"a\"\n:\n\"b\"\n,\n\"c\"\n:\n\"d\"\n}").to be_parsed_as_json({"a"=>"b","c"=>"d"}) }
+    json_hash_with_comment = <<EOH
+{
+ "a": 1, # this is a
+ "b": 2, # this is b
+ "c": 3  # this is c
+}
+EOH
+    it { expect(json_hash_with_comment).to be_parsed_as_json({"a"=>1,"b"=>2,"c"=>3}) }
   end
 end
 

data/test/test_parser.rb

@@ -161,37 +161,51 @@ module ParserTest
 
     def setup
       @parser = TextParser::TEMPLATE_REGISTRY.lookup('syslog').call
+      @expected = {
+        'host'    => '192.168.0.1',
+        'ident'   => 'fluentd',
+        'pid'     => '11111',
+        'message' => '[error] Syslog test'
+      }
     end
 
     def test_call
       @parser.configure({})
       @parser.call('Feb 28 12:00:00 192.168.0.1 fluentd[11111]: [error] Syslog test') { |time, record|
         assert_equal(str2time('Feb 28 12:00:00', '%b %d %H:%M:%S'), time)
-        assert_equal({
-          'host'    => '192.168.0.1',
-          'ident'   => 'fluentd',
-          'pid'     => '11111',
-          'message' => '[error] Syslog test'
-        }, record)
+        assert_equal(@expected, record)
       }
       assert_equal(TextParser::SyslogParser::REGEXP, @parser.patterns['format'])
-      assert_equal(TextParser::SyslogParser::TIME_FORMAT, @parser.patterns['time_format'])
+      assert_equal("%b %d %H:%M:%S", @parser.patterns['time_format'])
+    end
+
+    def test_call_with_time_format
+      @parser.configure('time_format' => '%b %d %M:%S:%H')
+      @parser.call('Feb 28 00:00:12 192.168.0.1 fluentd[11111]: [error] Syslog test') { |time, record|
+        assert_equal(str2time('Feb 28 12:00:00', '%b %d %H:%M:%S'), time)
+        assert_equal(@expected, record)
+      }
+      assert_equal('%b %d %M:%S:%H', @parser.patterns['time_format'])
     end
 
     def test_call_with_priority
       @parser.configure('with_priority' => true)
       @parser.call('<6>Feb 28 12:00:00 192.168.0.1 fluentd[11111]: [error] Syslog test') { |time, record|
         assert_equal(str2time('Feb 28 12:00:00', '%b %d %H:%M:%S'), time)
-        assert_equal({
-          'pri'     => 6,
-          'host'    => '192.168.0.1',
-          'ident'   => 'fluentd',
-          'pid'     => '11111',
-          'message' => '[error] Syslog test'
-        }, record)
+        assert_equal(@expected.merge('pri' => 6), record)
       }
       assert_equal(TextParser::SyslogParser::REGEXP_WITH_PRI, @parser.patterns['format'])
-      assert_equal(TextParser::SyslogParser::TIME_FORMAT, @parser.patterns['time_format'])
+      assert_equal("%b %d %H:%M:%S", @parser.patterns['time_format'])
+    end
+
+    def test_call_without_colon
+      @parser.configure({})
+      @parser.call('Feb 28 12:00:00 192.168.0.1 fluentd[11111] [error] Syslog test') { |time, record|
+        assert_equal(str2time('Feb 28 12:00:00', '%b %d %H:%M:%S'), time)
+        assert_equal(@expected, record)
+      }
+      assert_equal(TextParser::SyslogParser::REGEXP, @parser.patterns['format'])
+      assert_equal("%b %d %H:%M:%S", @parser.patterns['time_format'])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.51
+  version: 0.10.52
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -240,8 +240,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
-description: Fluentd is an event collector system. It is a generalized version of
-  syslogd, which handles JSON objects for its log messages
+description: Fluentd is an open source data collector designed to scale and simplify
+  log management. It can collect, process and ship many kinds of data in near real-time.
 email:
 - frsyuki@gmail.com
 executables: