From a77db6bc47d8cdd9edae2ec22f640821d0794404 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 28 Oct 2019 15:05:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/puma.example.development.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'config/puma.example.development.rb') diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb index f23ccc23c9a..6f686437f88 100644 --- a/config/puma.example.development.rb +++ b/config/puma.example.development.rb @@ -14,9 +14,13 @@ rackup 'config.ru' pidfile '/home/git/gitlab/tmp/pids/puma.pid' state_path '/home/git/gitlab/tmp/pids/puma.state' -stdout_redirect '/home/git/gitlab/log/puma.stdout.log', - '/home/git/gitlab/log/puma.stderr.log', - true +## Uncomment the lines if you would like to write puma stdout & stderr streams +## to a different location than rails logs. +## When using GitLab Development Kit, by default, these logs will be consumed +## by runit and can be accessed using `gdk tail rails-web` +# stdout_redirect '/home/git/gitlab/log/puma.stdout.log', +# '/home/git/gitlab/log/puma.stderr.log', +# true # Configure "min" to be the minimum number of threads to use to answer # requests and "max" the maximum. -- cgit v1.2.3