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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
f982fef9
Commit
f982fef9
authored
Jun 15, 2017
by
Pawel Chojnacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru
parent
75d425e4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
config.ru
config.ru
+0
-3
config/boot.rb
config/boot.rb
+3
-0
No files found.
config.ru
View file @
f982fef9
...
@@ -15,9 +15,6 @@ if defined?(Unicorn)
...
@@ -15,9 +15,6 @@ if defined?(Unicorn)
end
end
end
end
# set default directory for multiproces metrics gathering
ENV
[
'prometheus_multiproc_dir'
]
||=
'tmp/prometheus_multiproc_dir'
require
::
File
.
expand_path
(
'../config/environment'
,
__FILE__
)
require
::
File
.
expand_path
(
'../config/environment'
,
__FILE__
)
map
ENV
[
'RAILS_RELATIVE_URL_ROOT'
]
||
"/"
do
map
ENV
[
'RAILS_RELATIVE_URL_ROOT'
]
||
"/"
do
...
...
config/boot.rb
View file @
f982fef9
...
@@ -5,6 +5,9 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
...
@@ -5,6 +5,9 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
require
'bundler/setup'
if
File
.
exist?
(
ENV
[
'BUNDLE_GEMFILE'
])
require
'bundler/setup'
if
File
.
exist?
(
ENV
[
'BUNDLE_GEMFILE'
])
# set default directory for multiproces metrics gathering
ENV
[
'prometheus_multiproc_dir'
]
||=
'tmp/prometheus_multiproc_dir'
# Default Bootsnap configuration from https://github.com/Shopify/bootsnap#usage
# Default Bootsnap configuration from https://github.com/Shopify/bootsnap#usage
require
'bootsnap'
require
'bootsnap'
Bootsnap
.
setup
(
Bootsnap
.
setup
(
...
...
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