Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
df3cb65a
Commit
df3cb65a
authored
Jan 18, 2021
by
Aleksei Lipniagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keep Puma 5compatibility checks
parent
27455707
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
6 deletions
+18
-6
config/puma.example.development.rb
config/puma.example.development.rb
+6
-2
config/puma.rb.example
config/puma.rb.example
+6
-2
config/puma_actioncable.example.development.rb
config/puma_actioncable.example.development.rb
+6
-2
No files found.
config/puma.example.development.rb
View file @
df3cb65a
...
...
@@ -80,10 +80,14 @@ tag 'gitlab-puma-worker'
worker_timeout
60
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
wait_for_less_busy_worker
ENV
.
fetch
(
'PUMA_WAIT_FOR_LESS_BUSY_WORKER'
,
0.001
).
to_f
if
defined?
(
wait_for_less_busy_worker
)
wait_for_less_busy_worker
ENV
.
fetch
(
'PUMA_WAIT_FOR_LESS_BUSY_WORKER'
,
0.001
).
to_f
end
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
nakayoshi_fork
unless
ENV
[
'DISABLE_PUMA_NAKAYOSHI_FORK'
]
if
defined?
(
nakayoshi_fork
)
nakayoshi_fork
unless
ENV
[
'DISABLE_PUMA_NAKAYOSHI_FORK'
]
end
# Use json formatter
require_relative
"/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
...
...
config/puma.rb.example
View file @
df3cb65a
...
...
@@ -70,10 +70,14 @@ tag 'gitlab-puma-worker'
worker_timeout 60
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
if defined?(wait_for_less_busy_worker)
wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
end
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK']
if defined?(nakayoshi_fork)
nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK']
end
# Use json formatter
require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
...
...
config/puma_actioncable.example.development.rb
View file @
df3cb65a
...
...
@@ -80,10 +80,14 @@ tag 'gitlab-actioncable-puma-worker'
worker_timeout
60
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
wait_for_less_busy_worker
ENV
.
fetch
(
'PUMA_WAIT_FOR_LESS_BUSY_WORKER'
,
0.001
).
to_f
if
defined?
(
wait_for_less_busy_worker
)
wait_for_less_busy_worker
ENV
.
fetch
(
'PUMA_WAIT_FOR_LESS_BUSY_WORKER'
,
0.001
).
to_f
end
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
nakayoshi_fork
unless
ENV
[
'DISABLE_PUMA_NAKAYOSHI_FORK'
]
if
defined?
(
nakayoshi_fork
)
nakayoshi_fork
unless
ENV
[
'DISABLE_PUMA_NAKAYOSHI_FORK'
]
end
# Use json formatter
require_relative
"/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment