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
bc821146
Commit
bc821146
authored
Dec 19, 2019
by
Matthias Kaeppler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename `app_server?` to `web_server?`
parent
dd1a80ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
config/initializers/7_prometheus_metrics.rb
config/initializers/7_prometheus_metrics.rb
+1
-1
lib/gitlab/gitaly_client.rb
lib/gitlab/gitaly_client.rb
+1
-1
lib/gitlab/runtime.rb
lib/gitlab/runtime.rb
+1
-1
No files found.
config/initializers/7_prometheus_metrics.rb
View file @
bc821146
...
...
@@ -58,7 +58,7 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
end
end
if
Gitlab
::
Runtime
.
app
_server?
if
Gitlab
::
Runtime
.
web
_server?
Gitlab
::
Cluster
::
LifecycleEvents
.
on_master_start
do
Gitlab
::
Metrics
::
Exporter
::
WebExporter
.
instance
.
start
end
...
...
lib/gitlab/gitaly_client.rb
View file @
bc821146
...
...
@@ -382,7 +382,7 @@ module Gitlab
end
def
self
.
long_timeout
if
Gitlab
::
Runtime
.
app
_server?
if
Gitlab
::
Runtime
.
web
_server?
default_timeout
else
6
.
hours
...
...
lib/gitlab/runtime.rb
View file @
bc821146
...
...
@@ -45,7 +45,7 @@ module Gitlab
!!
defined?
(
::
Rails
::
Console
)
end
def
app
_server?
def
web
_server?
puma?
||
unicorn?
end
...
...
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