Normalize log lines to UTF-8

planio-gmbh · Aug 24, 2016 · 1b92cf1 · 1b92cf1
1 parent 470163d
commit 1b92cf1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/rackstash/buffered_logger.rb b/lib/rackstash/buffered_logger.rb
@@ -243,7 +243,10 @@ def normalized_message(logs=[])
         msg = line[:message].to_s.gsub(/[\n\r]/, "\n")
         # remove any leading newlines and a single trailing newline
         msg = msg.sub(/\A\n+/, '').sub(/\n\z/, '')
-        "[#{Severities[line[:severity]]}] ".rjust(10) + msg
+        msg = "[#{Severities[line[:severity]]}] ".rjust(10) + msg
+        # Normalize the log line to UTF-8
+        msg.encode!(Encoding::UTF_8, invalid: :replace, undef: :replace) if msg.respond_to?(:encode!)
+        msg
       end.join("\n")
     end