From 276959295f4b016f1907781b9f59b7a68a1fe2d1 Mon Sep 17 00:00:00 2001
From: okkez <okkez000@gmail.com>
Date: Mon, 22 Feb 2016 21:40:31 +0900
Subject: [PATCH] Use PackedForward instead of Message

See https://github.com/fluent/fluentd/issues/671
---
 lib/fluent/logger/fluent_logger.rb | 25 +++++++++++++++++--------
 spec/fluent_logger_spec.rb         | 13 ++++++++-----
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/lib/fluent/logger/fluent_logger.rb b/lib/fluent/logger/fluent_logger.rb
index 89d0617..e417951 100644
--- a/lib/fluent/logger/fluent_logger.rb
+++ b/lib/fluent/logger/fluent_logger.rb
@@ -20,6 +20,8 @@
 require 'monitor'
 require 'logger'
 require 'json'
+require 'base64'
+require 'securerandom'
 
 module Fluent
   module Logger
@@ -130,9 +132,9 @@ def post_with_time(tag, map, time)
         @logger.debug { "event: #{tag} #{map.to_json}" rescue nil } if @logger.debug?
         tag = "#{@tag_prefix}.#{tag}" if @tag_prefix
         if @nanosecond_precision && time.is_a?(Time)
-          write [tag, EventTime.new(time), map]
+          write(tag, EventTime.new(time), map)
         else
-          write [tag, time.to_i, map]
+          write(tag, time.to_i, map)
         end
       end
 
@@ -140,7 +142,9 @@ def close
         @mon.synchronize {
           if @pending
             begin
-              send_data(@pending)
+              @pending.each do |tag, record|
+                send_data([tag, record].to_msgpack)
+              end
             rescue => e
               set_last_error(e)
               @logger.error("FluentLogger: Can't send logs to #{connection_string}: #{$!}")
@@ -200,20 +204,22 @@ def suppress_sec
         end
       end
 
-      def write(msg)
+      def write(tag, time, map)
         begin
-          data = to_msgpack(msg)
+          record = to_msgpack([time, map])
         rescue => e
           set_last_error(e)
+          msg = [tag, time, map]
           @logger.error("FluentLogger: Can't convert to msgpack: #{msg.inspect}: #{$!}")
           return false
         end
 
         @mon.synchronize {
           if @pending
-            @pending << data
+            @pending[tag] << record
           else
-            @pending = data
+            @pending = Hash.new{|h, k| h[k] = "" }
+            @pending[tag] = record
           end
 
           # suppress reconnection burst
@@ -224,7 +230,9 @@ def write(msg)
           end
 
           begin
-            send_data(@pending)
+            @pending.each do |tag, record|
+              send_data([tag, record].to_msgpack)
+            end
             @pending = nil
             true
           rescue => e
@@ -259,6 +267,7 @@ def send_data(data)
         #  end
         #  data = data[n..-1]
         #end
+
         true
       end
 
diff --git a/spec/fluent_logger_spec.rb b/spec/fluent_logger_spec.rb
index eb565f2..4098122 100644
--- a/spec/fluent_logger_spec.rb
+++ b/spec/fluent_logger_spec.rb
@@ -196,7 +196,7 @@
         logger_io.rewind
         log = logger_io.read
         expect(log).to match /Failed to connect/
-        expect(log).to match /Can't send logs to/
+        expect(log).to match /Can\'t send logs to/
       }
 
       it ('post limit over') do
@@ -206,11 +206,11 @@
         expect(fluentd.queue.last).to be_nil
 
         logger_io.rewind
-        expect(logger_io.read).not_to match /Can't send logs to/
+        expect(logger_io.read).not_to match /Can\'t send logs to/
 
         logger.post('tag', {'a' => ('c' * 1000)})
         logger_io.rewind
-        expect(logger_io.read).to match /Can't send logs to/
+        expect(logger_io.read).to match /Can\'t send logs to/
       end
 
       it ('log connect error once') do
@@ -233,8 +233,11 @@ class BufferOverflowHandler
 
         def flush(messages)
           @buffer ||= []
-          MessagePack::Unpacker.new.feed_each(messages) do |msg|
-            @buffer << msg
+          messages.each do |tag, message|
+            unpacker = MessagePack::Unpacker.new(StringIO.new(message))
+            unpacker.each do |time, record|
+              @buffer << [tag, time, record]
+            end
           end
         end
       end