lib/fluent/plugin/in_syslog.rb in fluentd-0.10.57 vs lib/fluent/plugin/in_syslog.rb in fluentd-0.10.58

@@ -82,13 +82,13 @@
     config_param :source_host_key, :string, :default => 'source_host'.freeze
 
     def configure(conf)
       super
 
-      parser = TextParser.new
-      if parser.configure(conf, false)
-        @parser = parser
+      if conf.has_key?('format')
+        @parser = Plugin.new_parser(conf['format'])
+        @parser.configure(conf)
       else
         conf['with_priority'] = true
         @parser = TextParser::SyslogParser.new
         @parser.configure(conf)
         @use_default = true
@@ -155,11 +155,11 @@
       log.error data.dump, :error => e.to_s
       log.error_backtrace
     end
 
     def receive_data(data, addr)
-      @parser.call(data) { |time, record|
+      @parser.parse(data) { |time, record|
         unless time && record
           log.warn "invalid syslog message", :data => data
           return
         end
 
@@ -190,10 +190,10 @@
       facility = FACILITY_MAP[pri >> 3]
       priority = PRIORITY_MAP[pri & 0b111]
 
       tag = "#{@tag}.#{facility}.#{priority}"
 
-      Engine.emit(tag, time, record)
+      router.emit(tag, time, record)
     rescue => e
       log.error "syslog failed to emit", :error => e.to_s, :error_class => e.class.to_s, :tag => tag, :record => Yajl.dump(record)
     end
   end
 end