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
87685428
Commit
87685428
authored
Feb 06, 2018
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd
parent
49003907
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lib/gitlab/sidekiq_middleware/memory_killer.rb
lib/gitlab/sidekiq_middleware/memory_killer.rb
+1
-1
No files found.
lib/gitlab/sidekiq_middleware/memory_killer.rb
View file @
87685428
...
@@ -45,7 +45,7 @@ module Gitlab
...
@@ -45,7 +45,7 @@ module Gitlab
private
private
def
get_rss
def
get_rss
output
,
status
=
Gitlab
::
Popen
.
popen
(
%W(ps -o rss= -p
#{
pid
}
)
)
output
,
status
=
Gitlab
::
Popen
.
popen
(
%W(ps -o rss= -p
#{
pid
}
)
,
Rails
.
root
.
to_s
)
return
0
unless
status
.
zero?
return
0
unless
status
.
zero?
output
.
to_i
output
.
to_i
...
...
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