github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9706 from hurf/shorten_id

Browse Source 
Shorten container ID in events
This commit is contained in:
Saad Ali 2015-06-16 15:58:30 -07:00
commit 6ada940e7f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/dockertools/manager.go
View File

@ -611,7 +611,7 @@ func (dm *DockerManager) runContainer(
} }
if ref != nil { if ref != nil {
dm.recorder.Eventf(ref, "created", "Created with docker id %v", dockerContainer.ID) dm.recorder.Eventf(ref, "created", "Created with docker id %v", util.ShortenString(dockerContainer.ID, 12))
} }
binds := makeMountBindings(opts.Mounts) binds := makeMountBindings(opts.Mounts)
@ -658,12 +658,12 @@ func (dm *DockerManager) runContainer(
if err = dm.client.StartContainer(dockerContainer.ID, hc); err != nil { if err = dm.client.StartContainer(dockerContainer.ID, hc); err != nil {
if ref != nil { if ref != nil {
dm.recorder.Eventf(ref, "failed", dm.recorder.Eventf(ref, "failed",
"Failed to start with docker id %v with error: %v", dockerContainer.ID, err) "Failed to start with docker id %v with error: %v", util.ShortenString(dockerContainer.ID, 12), err)
} }
return "", err return "", err
} }
if ref != nil { if ref != nil {
dm.recorder.Eventf(ref, "started", "Started with docker id %v", dockerContainer.ID) dm.recorder.Eventf(ref, "started", "Started with docker id %v", util.ShortenString(dockerContainer.ID, 12))
} }
return dockerContainer.ID, nil return dockerContainer.ID, nil
} }
@ -1152,7 +1152,7 @@ func (dm *DockerManager) killContainer(containerID types.UID) error {
glog.Warningf("No ref for pod '%v'", ID) glog.Warningf("No ref for pod '%v'", ID)
} else { } else {
// TODO: pass reason down here, and state, or move this call up the stack. // TODO: pass reason down here, and state, or move this call up the stack.
dm.recorder.Eventf(ref, "killing", "Killing %v", ID) dm.recorder.Eventf(ref, "killing", "Killing with docker id %v", util.ShortenString(ID, 12))
} }
return err return err
} }