From 2c8d6ac009efdb16c791801a2533062530c77548 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Thu, 20 Jul 2017 13:45:51 +0200 Subject: [PATCH] Don't cleanup ANSI chars and newlines in messages anymore These characters might be there deliberately. If they should be cleaned up, it can easily be done later with a filter. --- lib/rackstash/message.rb | 5 +---- spec/rackstash/message_spec.rb | 16 ---------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/lib/rackstash/message.rb b/lib/rackstash/message.rb index 0c5de1e..b3ec999 100644 --- a/lib/rackstash/message.rb +++ b/lib/rackstash/message.rb @@ -57,8 +57,6 @@ module Rackstash def cleanup(msg) msg = msg.inspect unless msg.is_a?(String) msg = utf8_encode(msg) - # remove useless ANSI color codes - msg.gsub!(/\e\[[0-9;]*m/, EMPTY_STRING) msg.freeze end @@ -66,8 +64,7 @@ module Rackstash str.to_s.encode( Encoding::UTF_8, invalid: :replace, - undef: :replace, - universal_newline: true + undef: :replace ) end diff --git a/spec/rackstash/message_spec.rb b/spec/rackstash/message_spec.rb index 6c28921..72db1c1 100644 --- a/spec/rackstash/message_spec.rb +++ b/spec/rackstash/message_spec.rb @@ -13,22 +13,6 @@ require 'rackstash/message' describe Rackstash::Message do describe '#initialize' do - it 'cleans the message' do - messages = [ - ["First\r\nSecond", "First\nSecond"], - ["First\r\nSecond\n\r", "First\nSecond\n\n"], - ["Foo\r\n\rBar", "Foo\n\nBar"], - ["\r \tWord\n\nPhrase\n", "\n \tWord\n\nPhrase\n"], - ["\e[31mRED TEXT\e[0m", 'RED TEXT'] - ] - - messages.each do |msg, clean| - message = described_class.new(msg) - expect(message.message).to eql clean - expect(message.message).to be_frozen - end - end - it 'encodes the message as UTF-8' do utf8_str = 'Dönerstraße' latin_str = utf8_str.encode(Encoding::ISO8859_9)