diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2018-03-14 12:34:58 +0100 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-03-14 12:34:58 +0100 |
commit | 896d640be196e8e62ac427ca675546fa1357bb38 (patch) | |
tree | 00a0120d03532dab0be4ee9043c5abaed87ce5ef | |
parent | a71de55126249f6a4efff28a276ead2f5db7bd82 (diff) | |
download | gitlab-shell-896d640be196e8e62ac427ca675546fa1357bb38.tar.gz |
Format pid= the same in go and ruby
-rw-r--r-- | lib/gitlab_logger.rb | 2 | ||||
-rw-r--r-- | 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 |