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
c7e4f44e
Commit
c7e4f44e
authored
Dec 18, 2019
by
Matthias Kaeppler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bring back Unicorn HttpServer check
Turns out this is actually necessary in some places
parent
cd29a8f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
lib/gitlab/runtime.rb
lib/gitlab/runtime.rb
+1
-1
spec/lib/gitlab/runtime_spec.rb
spec/lib/gitlab/runtime_spec.rb
+2
-0
No files found.
lib/gitlab/runtime.rb
View file @
c7e4f44e
...
...
@@ -34,7 +34,7 @@ module Gitlab
# For unicorn, we need to check for actual server instances to avoid false positives.
def
unicorn?
!!
defined?
(
::
Unicorn
)
!!
(
defined?
(
::
Unicorn
)
&&
defined?
(
::
Unicorn
::
HttpServer
)
)
end
def
sidekiq?
...
...
spec/lib/gitlab/runtime_spec.rb
View file @
c7e4f44e
...
...
@@ -41,9 +41,11 @@ describe Gitlab::Runtime do
context
"unicorn"
do
let
(
:unicorn_type
)
{
Module
.
new
}
let
(
:unicorn_server_type
)
{
Class
.
new
}
before
do
stub_const
(
'::Unicorn'
,
unicorn_type
)
stub_const
(
'::Unicorn::HttpServer'
,
unicorn_server_type
)
end
it
"identifies itself"
do
...
...
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