From 896d640be196e8e62ac427ca675546fa1357bb38 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 14 Mar 2018 12:34:58 +0100 Subject: Format pid= the same in go and ruby --- lib/gitlab_logger.rb | 2 +- spec/gitlab_logger_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/gitlab_logger.rb b/lib/gitlab_logger.rb index 241c5c2..d52339b 100644 --- a/lib/gitlab_logger.rb +++ b/lib/gitlab_logger.rb @@ -76,7 +76,7 @@ class GitlabLogger def format_key_value(key, value) value_string = value.to_s - value_string = value_string.inspect unless key == :level + value_string = value_string.inspect unless %i[level pid].include?(key) "#{key}=#{value_string}" end diff --git a/spec/gitlab_logger_spec.rb b/spec/gitlab_logger_spec.rb index 837da8c..e9a18ff 100644 --- a/spec/gitlab_logger_spec.rb +++ b/spec/gitlab_logger_spec.rb @@ -42,7 +42,7 @@ describe GitlabLogger do it 'logs data' do subject.info('hello', foo: 'bar') - expect(first_line).to eq('time="1973-11-29T21:33:09+00:00" foo="bar" pid="1234" level=info msg="hello"') + expect(first_line).to eq('time="1973-11-29T21:33:09+00:00" foo="bar" pid=1234 level=info msg="hello"') end end @@ -60,7 +60,7 @@ describe GitlabLogger do it 'logs data' do subject.warn('hello', foo: 'bar') - expect(first_line).to eq('time="1973-11-29T21:33:09+00:00" foo="bar" pid="1234" level=warn msg="hello"') + expect(first_line).to eq('time="1973-11-29T21:33:09+00:00" foo="bar" pid=1234 level=warn msg="hello"') end end @@ -77,7 +77,7 @@ describe GitlabLogger do it 'logs data' do subject.debug('hello', foo: 'bar') - expect(first_line).to eq('time="1973-11-29T21:33:09+00:00" foo="bar" pid="1234" level=debug msg="hello"') + expect(first_line).to eq('time="1973-11-29T21:33:09+00:00" foo="bar" pid=1234 level=debug msg="hello"') end end end -- cgit v1.2.1