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
Jérome Perrin
gitlab-ce
Commits
a7b1b512
Commit
a7b1b512
authored
Jun 27, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
better debugging for memory killer middleware
parent
4477dc24
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/sidekiq_middleware/memory_killer.rb
lib/gitlab/sidekiq_middleware/memory_killer.rb
+2
-2
No files found.
lib/gitlab/sidekiq_middleware/memory_killer.rb
View file @
a7b1b512
...
...
@@ -25,7 +25,7 @@ module Gitlab
Sidekiq
.
logger
.
warn
"current RSS
#{
current_rss
}
exceeds maximum RSS "
\
"
#{
MAX_RSS
}
"
Sidekiq
.
logger
.
warn
"this thread will shut down PID
#{
Process
.
pid
}
"
\
Sidekiq
.
logger
.
warn
"this thread will shut down PID
#{
Process
.
pid
}
- Worker
#{
worker
.
class
}
- JID-
#{
job
[
'jid'
]
}
"
\
"in
#{
GRACE_TIME
}
seconds"
sleep
(
GRACE_TIME
)
...
...
@@ -36,7 +36,7 @@ module Gitlab
"
#{
SHUTDOWN_SIGNAL
}
to PID
#{
Process
.
pid
}
"
sleep
(
SHUTDOWN_WAIT
)
Sidekiq
.
logger
.
warn
"sending
#{
SHUTDOWN_SIGNAL
}
to PID
#{
Process
.
pid
}
"
Sidekiq
.
logger
.
warn
"sending
#{
SHUTDOWN_SIGNAL
}
to PID
#{
Process
.
pid
}
- Worker
#{
worker
.
class
}
- JID-
#{
job
[
'jid'
]
}
"
Process
.
kill
(
SHUTDOWN_SIGNAL
,
Process
.
pid
)
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