diff --git a/lib/fluent/logger/fluent_logger.rb b/lib/fluent/logger/fluent_logger.rb index e82094f..9ea7618 100644 --- a/lib/fluent/logger/fluent_logger.rb +++ b/lib/fluent/logger/fluent_logger.rb @@ -152,7 +152,11 @@ def close if @pending begin @pending.each do |tag, record| +<<<<<<< HEAD send_data(tag, record) +======= + send_data([tag, record].to_msgpack) +>>>>>>> 4f98038... Use PackedForward instead of Message end rescue => e set_last_error(e) @@ -240,7 +244,11 @@ def write(tag, time, map) begin @pending.each do |tag, record| +<<<<<<< HEAD send_data(tag, record) +======= + send_data([tag, record].to_msgpack) +>>>>>>> 4f98038... Use PackedForward instead of Message end @pending = nil true @@ -293,6 +301,7 @@ def send_data(tag, record) # end # data = data[n..-1] #end +<<<<<<< HEAD end def send_data_nonblock(data) @@ -313,6 +322,8 @@ def send_data_nonblock(data) end end end +======= +>>>>>>> 4f98038... Use PackedForward instead of Message true end