Skip to content

Commit

Permalink
$log can't accept Exception classes
Browse files Browse the repository at this point in the history
  • Loading branch information
frsyuki committed Feb 14, 2012
1 parent 9a74112 commit b6fadf1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/fluent/plugin/in_exec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def each_line(line)
Engine.emit(tag, time, record)
end
rescue
$log.error "exec failed to emit", :error=>$!, :line=>line
$log.error "exec failed to emit", :error=>$!.to_s, :line=>line
$log.warn_backtrace $!.backtrace
end
end
Expand Down
4 changes: 2 additions & 2 deletions lib/fluent/plugin/out_exec_filter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def each_line(line)
Engine.emit(tag, time, record)
end
rescue
$log.error "exec_filter failed to emit", :error=>$!, :line=>line
$log.error "exec_filter failed to emit", :error=>$!.to_s, :line=>line
$log.warn_backtrace $!.backtrace
end

Expand Down Expand Up @@ -217,7 +217,7 @@ def write(chunk)
def run
@io.each_line(&@each_line)
rescue
$log.error "exec_filter process exited", :error=>$!
$log.error "exec_filter process exited", :error=>$!.to_s
$log.warn_backtrace $!.backtrace
ensure
Process.waitpid(@pid)
Expand Down
2 changes: 1 addition & 1 deletion lib/fluent/plugin/out_forward.rb
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def on_timer
@usock.send "", 0, sockaddr
rescue
# TODO log
$log.debug "failed to send heartbeat packet to #{Socket.unpack_sockaddr_in(sockaddr).reverse.join(':')}", :error=>$!
$log.debug "failed to send heartbeat packet to #{Socket.unpack_sockaddr_in(sockaddr).reverse.join(':')}", :error=>$!.to_s
end
}
end
Expand Down

0 comments on commit b6fadf1

Please sign in to comment.