fluentd 0.10.35 → 0.10.36

data/lib/fluent/plugin/in_syslog.rb

@@ -16,189 +16,185 @@
 #    limitations under the License.
 #
 module Fluent
+  class SyslogInput < Input
+    Plugin.register_input('syslog', self)
+
+    SYSLOG_REGEXP = /^\<([0-9]+)\>(.*)/
+    SYSLOG_ALL_REGEXP = /^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?[^\:]*\: *(?<message>.*)$/
+    TIME_FORMAT = "%b %d %H:%M:%S"
+
+    FACILITY_MAP = {
+      0   => 'kern',
+      1   => 'user',
+      2   => 'mail',
+      3   => 'daemon',
+      4   => 'auth',
+      5   => 'syslog',
+      6   => 'lpr',
+      7   => 'news',
+      8   => 'uucp',
+      9   => 'cron',
+      10  => 'authpriv',
+      11  => 'ftp',
+      12  => 'ntp',
+      13  => 'audit',
+      14  => 'alert',
+      15  => 'at',
+      16  => 'local0',
+      17  => 'local1',
+      18  => 'local2',
+      19  => 'local3',
+      20  => 'local4',
+      21  => 'local5',
+      22  => 'local6',
+      23  => 'local7'
+    }
 
+    PRIORITY_MAP = {
+      0  => 'emerg',
+      1  => 'alert',
+      2  => 'crit',
+      3  => 'err',
+      4  => 'warn',
+      5  => 'notice',
+      6  => 'info',
+      7  => 'debug'
+    }
 
-class SyslogInput < Input
-  Plugin.register_input('syslog', self)
-
-  SYSLOG_REGEXP = /^\<([0-9]+)\>(.*)/
-  SYSLOG_ALL_REGEXP = /^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?[^\:]*\: *(?<message>.*)$/
-  TIME_FORMAT = "%b %d %H:%M:%S"
-
-  FACILITY_MAP = {
-    0   => 'kern',
-    1   => 'user',
-    2   => 'mail',
-    3   => 'daemon',
-    4   => 'auth',
-    5   => 'syslog',
-    6   => 'lpr',
-    7   => 'news',
-    8   => 'uucp',
-    9   => 'cron',
-    10  => 'authpriv',
-    11  => 'ftp',
-    12  => 'ntp',
-    13  => 'audit',
-    14  => 'alert',
-    15  => 'at',
-    16  => 'local0',
-    17  => 'local1',
-    18  => 'local2',
-    19  => 'local3',
-    20  => 'local4',
-    21  => 'local5',
-    22  => 'local6',
-    23  => 'local7'
-  }
-
-  PRIORITY_MAP = {
-    0  => 'emerg',
-    1  => 'alert',
-    2  => 'crit',
-    3  => 'err',
-    4  => 'warn',
-    5  => 'notice',
-    6  => 'info',
-    7  => 'debug'
-  }
-
-  def initialize
-    super
-    require 'fluent/plugin/socket_util'
-  end
+    def initialize
+      super
+      require 'fluent/plugin/socket_util'
+    end
 
-  config_param :port, :integer, :default => 5140
-  config_param :bind, :string, :default => '0.0.0.0'
-  config_param :tag, :string
+    config_param :port, :integer, :default => 5140
+    config_param :bind, :string, :default => '0.0.0.0'
+    config_param :tag, :string
 
-  def configure(conf)
-    super
+    def configure(conf)
+      super
 
-    parser = TextParser.new
-    if parser.configure(conf, false)
-      @parser = parser
-    else
-      @parser = nil
-    end
-  end
-
-  def start
-    if @parser
-      callback = method(:receive_data_parser)
-    else
-      callback = method(:receive_data)
+      parser = TextParser.new
+      if parser.configure(conf, false)
+        @parser = parser
+      else
+        @parser = nil
+      end
     end
 
-    @loop = Coolio::Loop.new
-
-    $log.debug "listening syslog socket on #{@bind}:#{@port}"
-    @usock = SocketUtil.create_udp_socket(@bind)
-    @usock.bind(@bind, @port)
+    def start
+      if @parser
+        callback = method(:receive_data_parser)
+      else
+        callback = method(:receive_data)
+      end
 
-    @handler = UdpHandler.new(@usock, callback)
-    @loop.attach(@handler)
+      @loop = Coolio::Loop.new
 
-    @thread = Thread.new(&method(:run))
-  end
+      $log.debug "listening syslog socket on #{@bind}:#{@port}"
+      @usock = SocketUtil.create_udp_socket(@bind)
+      @usock.bind(@bind, @port)
 
-  def shutdown
-    @loop.watchers.each {|w| w.detach }
-    @loop.stop
-    @handler.close
-    @thread.join
-  end
+      @handler = UdpHandler.new(@usock, callback)
+      @loop.attach(@handler)
 
-  def run
-    @loop.run
-  rescue
-    $log.error "unexpected error", :error=>$!.to_s
-    $log.error_backtrace
-  end
+      @thread = Thread.new(&method(:run))
+    end
 
-  protected
-  def receive_data_parser(data)
-    m = SYSLOG_REGEXP.match(data)
-    unless m
-      $log.debug "invalid syslog message: #{data.dump}"
-      return
+    def shutdown
+      @loop.watchers.each {|w| w.detach }
+      @loop.stop
+      @handler.close
+      @thread.join
     end
-    pri = m[1].to_i
-    text = m[2]
 
-    time, record = @parser.parse(text)
-    unless time && record
-      return
+    def run
+      @loop.run
+    rescue
+      $log.error "unexpected error", :error=>$!.to_s
+      $log.error_backtrace
     end
 
-    emit(pri, time, record)
+    protected
+    def receive_data_parser(data)
+      m = SYSLOG_REGEXP.match(data)
+      unless m
+        $log.debug "invalid syslog message: #{data.dump}"
+        return
+      end
+      pri = m[1].to_i
+      text = m[2]
 
-  rescue
-    $log.warn data.dump, :error=>$!.to_s
-    $log.debug_backtrace
-  end
+      time, record = @parser.parse(text)
+      unless time && record
+        return
+      end
+
+      emit(pri, time, record)
 
-  def receive_data(data)
-    m = SYSLOG_ALL_REGEXP.match(data)
-    unless m
-      $log.debug "invalid syslog message", :data=>data
-      return
+    rescue
+      $log.warn data.dump, :error=>$!.to_s
+      $log.debug_backtrace
     end
 
-    pri = nil
-    time = nil
-    record = {}
-
-    m.names.each {|name|
-      if value = m[name]
-        case name
-        when "pri"
-          pri = value.to_i
-        when "time"
-          time = Time.strptime(value.gsub(/ +/, ' '), TIME_FORMAT).to_i
-        else
-          record[name] = value
-        end
+    def receive_data(data)
+      m = SYSLOG_ALL_REGEXP.match(data)
+      unless m
+        $log.debug "invalid syslog message", :data=>data
+        return
       end
-    }
 
-    time ||= Engine.now
+      pri = nil
+      time = nil
+      record = {}
+
+      m.names.each {|name|
+        if value = m[name]
+          case name
+          when "pri"
+            pri = value.to_i
+          when "time"
+            time = Time.strptime(value.gsub(/ +/, ' '), TIME_FORMAT).to_i
+          else
+            record[name] = value
+          end
+        end
+      }
 
-    emit(pri, time, record)
+      time ||= Engine.now
 
-  rescue
-    $log.warn data.dump, :error=>$!.to_s
-    $log.debug_backtrace
-  end
+      emit(pri, time, record)
 
-  private
-  def emit(pri, time, record)
-    facility = FACILITY_MAP[pri >> 3]
-    priority = PRIORITY_MAP[pri & 0b111]
+    rescue
+      $log.warn data.dump, :error=>$!.to_s
+      $log.debug_backtrace
+    end
 
-    tag = "#{@tag}.#{facility}.#{priority}"
+    private
+    def emit(pri, time, record)
+      facility = FACILITY_MAP[pri >> 3]
+      priority = PRIORITY_MAP[pri & 0b111]
 
-    Engine.emit(tag, time, record)
-  end
+      tag = "#{@tag}.#{facility}.#{priority}"
 
-  class UdpHandler < Coolio::IO
-    def initialize(io, callback)
-      super(io)
-      @io = io
-      @callback = callback
+      Engine.emit(tag, time, record)
     end
 
-    def on_readable
-      msg, addr = @io.recvfrom_nonblock(2048)
-      #host = addr[3]
-      #port = addr[1]
-      #@callback.call(host, port, msg)
-      @callback.call(msg)
-    rescue
-      # TODO log?
+    class UdpHandler < Coolio::IO
+      def initialize(io, callback)
+        super(io)
+        @io = io
+        @callback = callback
+      end
+
+      def on_readable
+        msg, addr = @io.recvfrom_nonblock(2048)
+        #host = addr[3]
+        #port = addr[1]
+        #@callback.call(host, port, msg)
+        @callback.call(msg)
+      rescue
+        # TODO log?
+      end
     end
   end
 end
-
-
-end

data/lib/fluent/plugin/in_tail.rb

@@ -16,485 +16,480 @@
 #    limitations under the License.
 #
 module Fluent
+  class TailInput < Input
+    Plugin.register_input('tail', self)
 
+    def initialize
+      super
+      @paths = []
+    end
 
-class TailInput < Input
-  Plugin.register_input('tail', self)
+    config_param :path, :string
+    config_param :tag, :string
+    config_param :rotate_wait, :time, :default => 5
+    config_param :pos_file, :string, :default => nil
 
-  def initialize
-    super
-    @paths = []
-  end
+    attr_reader :paths
 
-  config_param :path, :string
-  config_param :tag, :string
-  config_param :rotate_wait, :time, :default => 5
-  config_param :pos_file, :string, :default => nil
+    def configure(conf)
+      super
 
-  attr_reader :paths
+      @paths = @path.split(',').map {|path| path.strip }
+      if @paths.empty?
+        raise ConfigError, "tail: 'path' parameter is required on tail input"
+      end
 
-  def configure(conf)
-    super
+      if @pos_file
+        @pf_file = File.open(@pos_file, File::RDWR|File::CREAT, DEFAULT_FILE_PERMISSION)
+        @pf_file.sync = true
+        @pf = PositionFile.parse(@pf_file)
+      else
+        $log.warn "'pos_file PATH' parameter is not set to a 'tail' source."
+        $log.warn "this parameter is highly recommended to save the position to resume tailing."
+      end
 
-    @paths = @path.split(',').map {|path| path.strip }
-    if @paths.empty?
-      raise ConfigError, "tail: 'path' parameter is required on tail input"
+      configure_parser(conf)
     end
 
-    if @pos_file
-      @pf_file = File.open(@pos_file, File::RDWR|File::CREAT, DEFAULT_FILE_PERMISSION)
-      @pf_file.sync = true
-      @pf = PositionFile.parse(@pf_file)
-    else
-      $log.warn "'pos_file PATH' parameter is not set to a 'tail' source."
-      $log.warn "this parameter is highly recommended to save the position to resume tailing."
+    def configure_parser(conf)
+      @parser = TextParser.new
+      @parser.configure(conf)
     end
 
-    configure_parser(conf)
-  end
-
-  def configure_parser(conf)
-    @parser = TextParser.new
-    @parser.configure(conf)
-  end
-
-  def start
-    @loop = Coolio::Loop.new
-    @tails = @paths.map {|path|
-      pe = @pf ? @pf[path] : MemoryPositionEntry.new
-      TailWatcher.new(path, @rotate_wait, pe, &method(:receive_lines))
-    }
-    @tails.each {|tail|
-      tail.attach(@loop)
-    }
-    @thread = Thread.new(&method(:run))
-  end
+    def start
+      @loop = Coolio::Loop.new
+      @tails = @paths.map {|path|
+        pe = @pf ? @pf[path] : MemoryPositionEntry.new
+        TailWatcher.new(path, @rotate_wait, pe, &method(:receive_lines))
+      }
+      @tails.each {|tail|
+        tail.attach(@loop)
+      }
+      @thread = Thread.new(&method(:run))
+    end
 
-  def shutdown
-    @tails.each {|tail|
-      tail.close
-    }
-    @loop.stop
-    @thread.join
-    @pf_file.close if @pf_file
-  end
+    def shutdown
+      @tails.each {|tail|
+        tail.close
+      }
+      @loop.stop
+      @thread.join
+      @pf_file.close if @pf_file
+    end
 
-  def run
-    @loop.run
-  rescue
-    $log.error "unexpected error", :error=>$!.to_s
-    $log.error_backtrace
-  end
+    def run
+      @loop.run
+    rescue
+      $log.error "unexpected error", :error=>$!.to_s
+      $log.error_backtrace
+    end
 
-  def receive_lines(lines)
-    es = MultiEventStream.new
-    lines.each {|line|
-      begin
-        line.chomp!  # remove \n
-        time, record = parse_line(line)
-        if time && record
-          es.add(time, record)
+    def receive_lines(lines)
+      es = MultiEventStream.new
+      lines.each {|line|
+        begin
+          line.chomp!  # remove \n
+          time, record = parse_line(line)
+          if time && record
+            es.add(time, record)
+          end
+        rescue
+          $log.warn line.dump, :error=>$!.to_s
+          $log.debug_backtrace
         end
-      rescue
-        $log.warn line.dump, :error=>$!.to_s
-        $log.debug_backtrace
-      end
-    }
+      }
 
-    unless es.empty?
-      begin
-        Engine.emit_stream(@tag, es)
-      rescue
-        # ignore errors. Engine shows logs and backtraces.
+      unless es.empty?
+        begin
+          Engine.emit_stream(@tag, es)
+        rescue
+          # ignore errors. Engine shows logs and backtraces.
+        end
       end
     end
-  end
 
-  def parse_line(line)
-    return @parser.parse(line)
-  end
+    def parse_line(line)
+      return @parser.parse(line)
+    end
 
-  class TailWatcher
-    def initialize(path, rotate_wait, pe, &receive_lines)
-      @path = path
-      @rotate_wait = rotate_wait
-      @pe = pe || MemoryPositionEntry.new
-      @receive_lines = receive_lines
+    class TailWatcher
+      def initialize(path, rotate_wait, pe, &receive_lines)
+        @path = path
+        @rotate_wait = rotate_wait
+        @pe = pe || MemoryPositionEntry.new
+        @receive_lines = receive_lines
 
-      @rotate_queue = []
+        @rotate_queue = []
 
-      @timer_trigger = TimerWatcher.new(1, true, &method(:on_notify))
-      @stat_trigger = StatWatcher.new(path, &method(:on_notify))
+        @timer_trigger = TimerWatcher.new(1, true, &method(:on_notify))
+        @stat_trigger = StatWatcher.new(path, &method(:on_notify))
 
-      @rotate_handler = RotateHandler.new(path, &method(:on_rotate))
-      @io_handler = nil
-    end
+        @rotate_handler = RotateHandler.new(path, &method(:on_rotate))
+        @io_handler = nil
+      end
 
-    def attach(loop)
-      @timer_trigger.attach(loop)
-      @stat_trigger.attach(loop)
-      on_notify
-    end
+      def attach(loop)
+        @timer_trigger.attach(loop)
+        @stat_trigger.attach(loop)
+        on_notify
+      end
 
-    def detach
-      @timer_trigger.detach if @timer_trigger.attached?
-      @stat_trigger.detach if @stat_trigger.attached?
-    end
+      def detach
+        @timer_trigger.detach if @timer_trigger.attached?
+        @stat_trigger.detach if @stat_trigger.attached?
+      end
 
-    def close
-      @rotate_queue.reject! {|req|
-        req.io.close
-        true
-      }
-      detach
-    end
+      def close
+        @rotate_queue.reject! {|req|
+          req.io.close
+          true
+        }
+        detach
+      end
 
-    def on_notify
-      @rotate_handler.on_notify
-      return unless @io_handler
-      @io_handler.on_notify
-
-      # proceeds rotate queue
-      return if @rotate_queue.empty?
-      @rotate_queue.first.tick
-
-      while @rotate_queue.first.ready?
-        if io = @rotate_queue.first.io
-          stat = io.stat
-          inode = stat.ino
-          if inode == @pe.read_inode
-            # rotated file has the same inode number with the last file.
-            # assuming following situation:
-            #   a) file was once renamed and backed, or
-            #   b) symlink or hardlink to the same file is recreated
-            # in either case, seek to the saved position
-            pos = @pe.read_pos
+      def on_notify
+        @rotate_handler.on_notify
+        return unless @io_handler
+        @io_handler.on_notify
+
+        # proceeds rotate queue
+        return if @rotate_queue.empty?
+        @rotate_queue.first.tick
+
+        while @rotate_queue.first.ready?
+          if io = @rotate_queue.first.io
+            stat = io.stat
+            inode = stat.ino
+            if inode == @pe.read_inode
+              # rotated file has the same inode number with the last file.
+              # assuming following situation:
+              #   a) file was once renamed and backed, or
+              #   b) symlink or hardlink to the same file is recreated
+              # in either case, seek to the saved position
+              pos = @pe.read_pos
+            else
+              pos = io.pos
+            end
+            @pe.update(inode, pos)
+            io_handler = IOHandler.new(io, @pe, &@receive_lines)
           else
-            pos = io.pos
+            io_handler = NullIOHandler.new
           end
-          @pe.update(inode, pos)
-          io_handler = IOHandler.new(io, @pe, &@receive_lines)
-        else
-          io_handler = NullIOHandler.new
+          @io_handler.close
+          @io_handler = io_handler
+          @rotate_queue.shift
+          break if @rotate_queue.empty?
         end
-        @io_handler.close
-        @io_handler = io_handler
-        @rotate_queue.shift
-        break if @rotate_queue.empty?
       end
-    end
 
-    def on_rotate(io)
-      if @io_handler == nil
-        if io
-          # first time
-          stat = io.stat
-          fsize = stat.size
-          inode = stat.ino
-
-          last_inode = @pe.read_inode
-          if inode == last_inode
-            # seek to the saved position
-            pos = @pe.read_pos
-          elsif last_inode != 0
-            # this is FilePositionEntry and fluentd once started.
-            # read data from the head of the rotated file.
-            # logs never duplicate because this file is a rotated new file.
-            pos = 0
-            @pe.update(inode, pos)
+      def on_rotate(io)
+        if @io_handler == nil
+          if io
+            # first time
+            stat = io.stat
+            fsize = stat.size
+            inode = stat.ino
+
+            last_inode = @pe.read_inode
+            if inode == last_inode
+              # seek to the saved position
+              pos = @pe.read_pos
+            elsif last_inode != 0
+              # this is FilePositionEntry and fluentd once started.
+              # read data from the head of the rotated file.
+              # logs never duplicate because this file is a rotated new file.
+              pos = 0
+              @pe.update(inode, pos)
+            else
+              # this is MemoryPositionEntry or this is the first time fluentd started.
+              # seek to the end of the any files.
+              # logs may duplicate without this seek because it's not sure the file is
+              # existent file or rotated new file.
+              pos = fsize
+              @pe.update(inode, pos)
+            end
+            io.seek(pos)
+
+            @io_handler = IOHandler.new(io, @pe, &@receive_lines)
           else
-            # this is MemoryPositionEntry or this is the first time fluentd started.
-            # seek to the end of the any files.
-            # logs may duplicate without this seek because it's not sure the file is
-            # existent file or rotated new file.
-            pos = fsize
-            @pe.update(inode, pos)
+            @io_handler = NullIOHandler.new
           end
-          io.seek(pos)
 
-          @io_handler = IOHandler.new(io, @pe, &@receive_lines)
         else
-          @io_handler = NullIOHandler.new
-        end
-
-      else
-        if io && @rotate_queue.find {|req| req.io == io }
-          return
-        end
-        last_io = @rotate_queue.empty? ? @io_handler.io : @rotate_queue.last.io
-        if last_io == nil
-          $log.info "detected rotation of #{@path}"
-          # rotate imeediately if previous file is nil
-          wait = 0
-        else
-          $log.info "detected rotation of #{@path}; waiting #{@rotate_wait} seconds"
-          wait = @rotate_wait
-          wait -= @rotate_queue.first.wait unless @rotate_queue.empty?
+          if io && @rotate_queue.find {|req| req.io == io }
+            return
+          end
+          last_io = @rotate_queue.empty? ? @io_handler.io : @rotate_queue.last.io
+          if last_io == nil
+            $log.info "detected rotation of #{@path}"
+            # rotate imeediately if previous file is nil
+            wait = 0
+          else
+            $log.info "detected rotation of #{@path}; waiting #{@rotate_wait} seconds"
+            wait = @rotate_wait
+            wait -= @rotate_queue.first.wait unless @rotate_queue.empty?
+          end
+          @rotate_queue << RotationRequest.new(io, wait)
         end
-        @rotate_queue << RotationRequest.new(io, wait)
       end
-    end
 
-    class TimerWatcher < Coolio::TimerWatcher
-      def initialize(interval, repeat, &callback)
-        @callback = callback
-        super(interval, repeat)
-      end
+      class TimerWatcher < Coolio::TimerWatcher
+        def initialize(interval, repeat, &callback)
+          @callback = callback
+          super(interval, repeat)
+        end
 
-      def on_timer
-        @callback.call
-      rescue
-        # TODO log?
-        $log.error $!.to_s
-        $log.error_backtrace
+        def on_timer
+          @callback.call
+        rescue
+          # TODO log?
+          $log.error $!.to_s
+          $log.error_backtrace
+        end
       end
-    end
 
-    class StatWatcher < Coolio::StatWatcher
-      def initialize(path, &callback)
-        @callback = callback
-        super(path)
-      end
+      class StatWatcher < Coolio::StatWatcher
+        def initialize(path, &callback)
+          @callback = callback
+          super(path)
+        end
 
-      def on_change(prev, cur)
-        @callback.call
-      rescue
-        # TODO log?
-        $log.error $!.to_s
-        $log.error_backtrace
+        def on_change(prev, cur)
+          @callback.call
+        rescue
+          # TODO log?
+          $log.error $!.to_s
+          $log.error_backtrace
+        end
       end
-    end
 
-    class RotationRequest
-      def initialize(io, wait)
-        @io = io
-        @wait = wait
-      end
+      class RotationRequest
+        def initialize(io, wait)
+          @io = io
+          @wait = wait
+        end
 
-      attr_reader :io, :wait
+        attr_reader :io, :wait
 
-      def tick
-        @wait -= 1
-      end
+        def tick
+          @wait -= 1
+        end
 
-      def ready?
-        @wait <= 0
+        def ready?
+          @wait <= 0
+        end
       end
-    end
 
-    MAX_LINES_AT_ONCE = 1000
-
-    class IOHandler
-      def initialize(io, pe, &receive_lines)
-        $log.info "following tail of #{io.path}"
-        @io = io
-        @pe = pe
-        @receive_lines = receive_lines
-        @buffer = ''.force_encoding('ASCII-8BIT')
-        @iobuf = ''.force_encoding('ASCII-8BIT')
-      end
+      MAX_LINES_AT_ONCE = 1000
 
-      attr_reader :io
+      class IOHandler
+        def initialize(io, pe, &receive_lines)
+          $log.info "following tail of #{io.path}"
+          @io = io
+          @pe = pe
+          @receive_lines = receive_lines
+          @buffer = ''.force_encoding('ASCII-8BIT')
+          @iobuf = ''.force_encoding('ASCII-8BIT')
+        end
 
-      def on_notify
-        begin
-          lines = []
-          read_more = false
+        attr_reader :io
 
+        def on_notify
           begin
-            while true
-              if @buffer.empty?
-                @io.read_nonblock(2048, @buffer)
-              else
-                @buffer << @io.read_nonblock(2048, @iobuf)
-              end
-              while line = @buffer.slice!(/.*?\n/m)
-                lines << line
-              end
-              if lines.size >= MAX_LINES_AT_ONCE
-                # not to use too much memory in case the file is very large
-                read_more = true
-                break
+            lines = []
+            read_more = false
+
+            begin
+              while true
+                if @buffer.empty?
+                  @io.read_nonblock(2048, @buffer)
+                else
+                  @buffer << @io.read_nonblock(2048, @iobuf)
+                end
+                while line = @buffer.slice!(/.*?\n/m)
+                  lines << line
+                end
+                if lines.size >= MAX_LINES_AT_ONCE
+                  # not to use too much memory in case the file is very large
+                  read_more = true
+                  break
+                end
               end
+            rescue EOFError
             end
-          rescue EOFError
-          end
 
-          unless lines.empty?
-            @receive_lines.call(lines)
-            @pe.update_pos(@io.pos - @buffer.bytesize)
-          end
+            unless lines.empty?
+              @receive_lines.call(lines)
+              @pe.update_pos(@io.pos - @buffer.bytesize)
+            end
 
-        end while read_more
+          end while read_more
 
-      rescue
-        $log.error $!.to_s
-        $log.error_backtrace
-        close
-      end
-
-      def close
-        @io.close unless @io.closed?
-      end
-    end
+        rescue
+          $log.error $!.to_s
+          $log.error_backtrace
+          close
+        end
 
-    class NullIOHandler
-      def initialize
+        def close
+          @io.close unless @io.closed?
+        end
       end
 
-      def io
-      end
+      class NullIOHandler
+        def initialize
+        end
 
-      def on_notify
-      end
+        def io
+        end
 
-      def close
-      end
-    end
+        def on_notify
+        end
 
-    class RotateHandler
-      def initialize(path, &on_rotate)
-        @path = path
-        @inode = nil
-        @fsize = -1  # first
-        @on_rotate = on_rotate
-        @path = path
+        def close
+        end
       end
 
-      def on_notify
-        begin
-          io = File.open(@path)
-          stat = io.stat
-          inode = stat.ino
-          fsize = stat.size
-        rescue Errno::ENOENT
-          # moved or deleted
-          inode = nil
-          fsize = 0
+      class RotateHandler
+        def initialize(path, &on_rotate)
+          @path = path
+          @inode = nil
+          @fsize = -1  # first
+          @on_rotate = on_rotate
+          @path = path
         end
 
-        begin
-          if @inode != inode || fsize < @fsize
-            # rotated or truncated
-            @on_rotate.call(io)
-            io = nil
+        def on_notify
+          begin
+            io = File.open(@path)
+            stat = io.stat
+            inode = stat.ino
+            fsize = stat.size
+          rescue Errno::ENOENT
+            # moved or deleted
+            inode = nil
+            fsize = 0
           end
 
-          @inode = inode
-          @fsize = fsize
-        ensure
-          io.close if io
-        end
+          begin
+            if @inode != inode || fsize < @fsize
+              # rotated or truncated
+              @on_rotate.call(io)
+              io = nil
+            end
+
+            @inode = inode
+            @fsize = fsize
+          ensure
+            io.close if io
+          end
 
-      rescue
-        $log.error $!.to_s
-        $log.error_backtrace
+        rescue
+          $log.error $!.to_s
+          $log.error_backtrace
+        end
       end
     end
-  end
 
 
-  class PositionFile
-    def initialize(file, map, last_pos)
-      @file = file
-      @map = map
-      @last_pos = last_pos
-    end
-
-    def [](path)
-      if m = @map[path]
-        return m
+    class PositionFile
+      def initialize(file, map, last_pos)
+        @file = file
+        @map = map
+        @last_pos = last_pos
       end
 
-      @file.pos = @last_pos
-      @file.write path
-      @file.write "\t"
-      seek = @file.pos
-      @file.write "0000000000000000\t00000000\n"
-      @last_pos = @file.pos
+      def [](path)
+        if m = @map[path]
+          return m
+        end
 
-      @map[path] = FilePositionEntry.new(@file, seek)
-    end
+        @file.pos = @last_pos
+        @file.write path
+        @file.write "\t"
+        seek = @file.pos
+        @file.write "0000000000000000\t00000000\n"
+        @last_pos = @file.pos
 
-    def self.parse(file)
-      map = {}
-      file.pos = 0
-      file.each_line {|line|
-        m = /^([^\t]+)\t([0-9a-fA-F]+)\t([0-9a-fA-F]+)/.match(line)
-        next unless m
-        path = m[1]
-        pos = m[2].to_i(16)
-        ino = m[3].to_i(16)
-        seek = file.pos - line.bytesize + path.bytesize + 1
-        map[path] = FilePositionEntry.new(file, seek)
-      }
-      new(file, map, file.pos)
-    end
-  end
+        @map[path] = FilePositionEntry.new(@file, seek)
+      end
 
-  # pos               inode
-  # ffffffffffffffff\tffffffff\n
-  class FilePositionEntry
-    POS_SIZE = 16
-    INO_OFFSET = 17
-    INO_SIZE = 8
-    LN_OFFSET = 25
-    SIZE = 26
-
-    def initialize(file, seek)
-      @file = file
-      @seek = seek
+      def self.parse(file)
+        map = {}
+        file.pos = 0
+        file.each_line {|line|
+          m = /^([^\t]+)\t([0-9a-fA-F]+)\t([0-9a-fA-F]+)/.match(line)
+          next unless m
+          path = m[1]
+          pos = m[2].to_i(16)
+          ino = m[3].to_i(16)
+          seek = file.pos - line.bytesize + path.bytesize + 1
+          map[path] = FilePositionEntry.new(file, seek)
+        }
+        new(file, map, file.pos)
+      end
     end
 
-    def update(ino, pos)
-      @file.pos = @seek
-      @file.write "%016x\t%08x" % [pos, ino]
-      @inode = ino
-    end
+    # pos               inode
+    # ffffffffffffffff\tffffffff\n
+    class FilePositionEntry
+      POS_SIZE = 16
+      INO_OFFSET = 17
+      INO_SIZE = 8
+      LN_OFFSET = 25
+      SIZE = 26
+
+      def initialize(file, seek)
+        @file = file
+        @seek = seek
+      end
 
-    def update_pos(pos)
-      @file.pos = @seek
-      @file.write "%016x" % pos
-    end
+      def update(ino, pos)
+        @file.pos = @seek
+        @file.write "%016x\t%08x" % [pos, ino]
+        @inode = ino
+      end
 
-    def read_inode
-      @file.pos = @seek + INO_OFFSET
-      raw = @file.read(8)
-      raw ? raw.to_i(16) : 0
-    end
+      def update_pos(pos)
+        @file.pos = @seek
+        @file.write "%016x" % pos
+      end
 
-    def read_pos
-      @file.pos = @seek
-      raw = @file.read(16)
-      raw ? raw.to_i(16) : 0
-    end
-  end
+      def read_inode
+        @file.pos = @seek + INO_OFFSET
+        raw = @file.read(8)
+        raw ? raw.to_i(16) : 0
+      end
 
-  class MemoryPositionEntry
-    def initialize
-      @pos = 0
-      @inode = 0
+      def read_pos
+        @file.pos = @seek
+        raw = @file.read(16)
+        raw ? raw.to_i(16) : 0
+      end
     end
 
-    def update(ino, pos)
-      @inode = ino
-      @pos = pos
-    end
+    class MemoryPositionEntry
+      def initialize
+        @pos = 0
+        @inode = 0
+      end
 
-    def update_pos(pos)
-      @pos = pos
-    end
+      def update(ino, pos)
+        @inode = ino
+        @pos = pos
+      end
 
-    def read_pos
-      @pos
-    end
+      def update_pos(pos)
+        @pos = pos
+      end
 
-    def read_inode
-      @inode
+      def read_pos
+        @pos
+      end
+
+      def read_inode
+        @inode
+      end
     end
   end
 end
-
-
-end
-