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
Léo-Paul Géneau
gitlab-ce
Commits
5f2dc999
Commit
5f2dc999
authored
Jun 20, 2017
by
Pawel Chojnacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use proper `if defined?` check.
parent
ed5c7d11
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
lib/gitlab/metrics/prometheus.rb
lib/gitlab/metrics/prometheus.rb
+5
-2
No files found.
lib/gitlab/metrics/prometheus.rb
View file @
5f2dc999
...
@@ -6,12 +6,15 @@ module Gitlab
...
@@ -6,12 +6,15 @@ module Gitlab
include
Gitlab
::
CurrentSettings
include
Gitlab
::
CurrentSettings
def
metrics_folder_present?
def
metrics_folder_present?
ENV
.
has_key?
(
'prometheus_multiproc_dir'
)
&&
::
Dir
.
exist?
(
ENV
[
'prometheus_multiproc_dir'
])
&&
ENV
.
has_key?
(
'prometheus_multiproc_dir'
)
&&
::
Dir
.
exist?
(
ENV
[
'prometheus_multiproc_dir'
])
&&
::
File
.
writable?
(
ENV
[
'prometheus_multiproc_dir'
])
::
File
.
writable?
(
ENV
[
'prometheus_multiproc_dir'
])
end
end
def
prometheus_metrics_enabled?
def
prometheus_metrics_enabled?
@prometheus_metrics_enabled
||=
prometheus_metrics_enabled_unmemoized
return
@prometheus_metrics_enabled
if
defined?
(
@prometheus_metrics_enabled
)
@prometheus_metrics_enabled
=
prometheus_metrics_enabled_unmemoized
end
end
def
registry
def
registry
...
...
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