diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 21:07:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 21:07:34 +0300 |
commit | 90859e80ca23b8709d56b60d2066b569053e7e02 (patch) | |
tree | 15d9ac5c194220fab358c42325645fdf2c6ead13 /config/puma.rb.example | |
parent | 7530cf5ad8dd86fbe19e129b6bb31b23849ed757 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/puma.rb.example')
-rw-r--r-- | config/puma.rb.example | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/puma.rb.example b/config/puma.rb.example index 10f255a87de..cd7adca157f 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -68,3 +68,11 @@ tag 'gitlab-puma-worker' # value is 60 seconds. # worker_timeout 60 + +# Use json formatter +require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" + +json_formatter = Gitlab::PumaLogging::JSONFormatter.new +log_formatter do |str| + json_formatter.call(str) +end
\ No newline at end of file |