BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b351a77a
Commit
b351a77a
authored
Mar 29, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_rake_gitlab_check_sidekiq' into 'master'
Make bundle exec rake gitlab:check RAILS_ENV=production Closes #30084 See merge request !10246
parents
c189bf11
d8569440
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
background_jobs_controller.rb
app/controllers/admin/background_jobs_controller.rb
+1
-1
fix_rake_gitlab_check_sidekiq.yml
changelogs/unreleased/fix_rake_gitlab_check_sidekiq.yml
+4
-0
check.rake
lib/tasks/gitlab/check.rake
+2
-2
No files found.
app/controllers/admin/background_jobs_controller.rb
View file @
b351a77a
class
Admin
::
BackgroundJobsController
<
Admin
::
ApplicationController
def
show
ps_output
,
_
=
Gitlab
::
Popen
.
popen
(
%W(ps -U
#{
Gitlab
.
config
.
gitlab
.
user
}
-o pid,pcpu,pmem,stat,start,command)
)
ps_output
,
_
=
Gitlab
::
Popen
.
popen
(
%W(ps
ww
-U
#{
Gitlab
.
config
.
gitlab
.
user
}
-o pid,pcpu,pmem,stat,start,command)
)
@sidekiq_processes
=
ps_output
.
split
(
"
\n
"
).
grep
(
/sidekiq/
)
@concurrency
=
Sidekiq
.
options
[
:concurrency
]
end
...
...
changelogs/unreleased/fix_rake_gitlab_check_sidekiq.yml
0 → 100644
View file @
b351a77a
---
title
:
Force unlimited terminal size when checking processes via call to ps
merge_request
:
10246
author
:
Sebastian Reitenbach
lib/tasks/gitlab/check.rake
View file @
b351a77a
...
...
@@ -617,7 +617,7 @@ namespace :gitlab do
end
def
sidekiq_process_count
ps_ux
,
_
=
Gitlab
::
Popen
.
popen
(
%w(ps ux)
)
ps_ux
,
_
=
Gitlab
::
Popen
.
popen
(
%w(ps ux
ww
)
)
ps_ux
.
scan
(
/sidekiq \d+\.\d+\.\d+/
).
count
end
end
...
...
@@ -751,7 +751,7 @@ namespace :gitlab do
end
def
mail_room_running?
ps_ux
,
_
=
Gitlab
::
Popen
.
popen
(
%w(ps ux)
)
ps_ux
,
_
=
Gitlab
::
Popen
.
popen
(
%w(ps ux
ww
)
)
ps_ux
.
include?
(
"mail_room"
)
end
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