lib/timber/logger.rb in timber-1.0.11 vs lib/timber/logger.rb in timber-1.0.12

@@ -117,35 +117,18 @@
         # use << for concatenation for performance reasons
         build_log_entry(severity, time, progname, msg).to_json() << "\n"
       end
     end
 
-    # Structures your log messages into JSON.
-    #
-    #   logger = Timber::Logger.new(STDOUT)
-    #   logger.formatter = Timber::JSONFormatter.new
-    #
-    # Example message:
-    #
-    #   {"level":"info","dt":"2016-09-01T07:00:00.000000-05:00","message":"My log message"}
-    #
-    class MsgPackFormatter < Formatter
+    # Passes through the LogEntry object. This is specifically used for the {Timber::LogDevices::HTTP}
+    # class. This allows the IO device to format it however it wants. This is neccessary for
+    # MessagePack because it requires a fixed array size before encoding. And since HTTP is
+    # sending data in batches, the encoding should happen there.
+    class PassThroughFormatter < Formatter
       def call(severity, time, progname, msg)
-        # use << for concatenation for performance reasons
-        hash = build_log_entry(severity, time, progname, msg).as_json
-        to_msgpack(hash) << "\n"
+        build_log_entry(severity, time, progname, msg)
       end
-
-      private
-        def to_msgpack(msg)
-          begin
-            msg.to_msgpack
-          rescue NoMethodError
-            json = JSON.generate(msg)
-            JSON.parse(json).to_msgpack
-          end
-        end
     end
 
     # Creates a new Timber::Logger instances. Accepts the same arguments as `::Logger.new`.
     # The only difference is that it default the formatter to {HybridFormatter}. Using
     # a different formatter is easy. For example, if you prefer your logs in JSON.
@@ -154,19 +137,19 @@
     #   logger = Timber::Logger.new(STDOUT)
     #   logger.formatter = Timber::Logger::JSONFormatter.new
     def initialize(*args)
       super(*args)
       if args.size == 1 and args.first.is_a?(LogDevices::HTTP)
-        self.formatter = MsgPackFormatter.new
+        self.formatter = PassThroughFormatter.new
       else
         self.formatter = HybridFormatter.new
       end
     end
 
     def formatter=(value)
       if @dev.is_a?(Timber::LogDevices::HTTP)
         raise ArgumentError.new("The formatter cannot be changed when using the " +
-          "Timber::LogDevices::HTTP log device. The MsgPackFormatter must be used for proper " +
+          "Timber::LogDevices::HTTP log device. The PassThroughFormatter must be used for proper " +
           "delivery.")
       end
       super
     end
 
\ No newline at end of file