containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove explicit setting of ExitCode 

That will be set in defer anyway. Also there was race between setting
ExitCode and inspect.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2015-01-29 14:50:42 -08:00
parent 8dbaed1d96
commit e7f6433109
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/monitor.go
View File

@ -168,12 +168,10 @@ func (m *containerMonitor) Start() error {
// we need to check this before reentering the loop because the waitForNextRestart could have // we need to check this before reentering the loop because the waitForNextRestart could have
// been terminated by a request from a user // been terminated by a request from a user
if m.shouldStop { if m.shouldStop {
m.container.ExitCode = exitStatus.ExitCode
return err return err
} }
continue continue
} }
m.container.ExitCode = exitStatus.ExitCode
if exitStatus.OOMKilled { if exitStatus.OOMKilled {
m.container.LogEvent("oom") m.container.LogEvent("oom")
} }