Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
| ... | ... |
@@ -178,7 +178,7 @@ func (d *driver) Terminate(p *execdriver.Command) error {
|
| 178 | 178 |
} |
| 179 | 179 |
// TODO: Remove this part for version 1.2.0 |
| 180 | 180 |
// This is added only to ensure smooth upgrades from pre 1.1.0 to 1.1.0 |
| 181 |
- data, err := ioutil.ReadAll(filepath.Join(d.root, p.ID, "start")) |
|
| 181 |
+ data, err := ioutil.ReadFile(filepath.Join(d.root, p.ID, "start")) |
|
| 182 | 182 |
if err != nil {
|
| 183 | 183 |
// if we don't have the data on disk then we can assume the process is gone |
| 184 | 184 |
// because this is only removed after we know the process has stopped |
| ... | ... |
@@ -187,7 +187,7 @@ func (d *driver) Terminate(p *execdriver.Command) error {
|
| 187 | 187 |
} |
| 188 | 188 |
return err |
| 189 | 189 |
} |
| 190 |
- state.InitStartTime = string(data) |
|
| 190 |
+ state = &libcontainer.State{InitStartTime: string(data)}
|
|
| 191 | 191 |
} |
| 192 | 192 |
|
| 193 | 193 |
currentStartTime, err := system.GetProcessStartTime(p.Process.Pid) |