clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9246 from estesp/add-oom-event

Browse Source 
Proposal: Add "OOM killed" event based on OOM state information
This commit is contained in:
James Turnbull
2014-12-26 22:54:02 -05:00
parent b49d3dd588 44cab4a4ff
commit 8722b6db4b
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/monitor.go
+6
View File
@@ -154,6 +154,9 @@ func (m *containerMonitor) Start() error {
if m.shouldRestart(exitStatus.ExitCode) {
m.container.SetRestarting(&exitStatus)
if exitStatus.OOMKilled {
m.container.LogEvent("oom")
}
m.container.LogEvent("die")
m.resetContainer(true)
@@ -170,6 +173,9 @@ func (m *containerMonitor) Start() error {
continue
}
m.container.ExitCode = exitStatus.ExitCode
if exitStatus.OOMKilled {
m.container.LogEvent("oom")
}
m.container.LogEvent("die")
m.resetContainer(true)
return err