kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

ensure the use oh IDs and add image's name in /events

This commit is contained in:
Victor Vieux 2013-08-12 11:50:03 +00:00
parent 3f95d1b9bf
commit 703905d7ec
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container.go
View File

@ -813,7 +813,7 @@ func (container *Container) monitor() {
} }
utils.Debugf("Process finished") utils.Debugf("Process finished")
if container.runtime != nil && container.runtime.srv != nil { if container.runtime != nil && container.runtime.srv != nil {
container.runtime.srv.LogEvent("die", container.ShortID()) container.runtime.srv.LogEvent("die", container.ShortID(), container.runtime.repositories.ImageName(container.Image))
} }
exitCode := -1 exitCode := -1
if container.cmd != nil { if container.cmd != nil {

22
server.go
View File

@ -76,7 +76,7 @@ func (srv *Server) ContainerKill(name string) error {
if err := container.Kill(); err != nil { if err := container.Kill(); err != nil {
return fmt.Errorf("Error killing container %s: %s", name, err) return fmt.Errorf("Error killing container %s: %s", name, err)
} }
srv.LogEvent("kill", name) srv.LogEvent("kill", container.ShortID(), srv.runtime.repositories.ImageName(container.Image))
} else { } else {
return fmt.Errorf("No such container: %s", name) return fmt.Errorf("No such container: %s", name)
} }
@ -95,7 +95,7 @@ func (srv *Server) ContainerExport(name string, out io.Writer) error {
if _, err := io.Copy(out, data); err != nil { if _, err := io.Copy(out, data); err != nil {
return err return err
} }
srv.LogEvent("export", name) srv.LogEvent("export", container.ShortID(), srv.runtime.repositories.ImageName(container.Image))
return nil return nil
} }
return fmt.Errorf("No such container: %s", name) return fmt.Errorf("No such container: %s", name)
@ -832,7 +832,7 @@ func (srv *Server) ContainerCreate(config *Config) (string, error) {
} }
return "", err return "", err
} }
srv.LogEvent("create", container.ShortID()) srv.LogEvent("create", container.ShortID(), srv.runtime.repositories.ImageName(container.Image))
return container.ShortID(), nil return container.ShortID(), nil
} }
@ -841,7 +841,7 @@ func (srv *Server) ContainerRestart(name string, t int) error {
if err := container.Restart(t); err != nil { if err := container.Restart(t); err != nil {
return fmt.Errorf("Error restarting container %s: %s", name, err) return fmt.Errorf("Error restarting container %s: %s", name, err)
} }
srv.LogEvent("restart", name) srv.LogEvent("restart", container.ShortID(), srv.runtime.repositories.ImageName(container.Image))
} else { } else {
return fmt.Errorf("No such container: %s", name) return fmt.Errorf("No such container: %s", name)
} }
@ -861,7 +861,7 @@ func (srv *Server) ContainerDestroy(name string, removeVolume bool) error {
if err := srv.runtime.Destroy(container); err != nil { if err := srv.runtime.Destroy(container); err != nil {
return fmt.Errorf("Error destroying container %s: %s", name, err) return fmt.Errorf("Error destroying container %s: %s", name, err)
} }
srv.LogEvent("destroy", name) srv.LogEvent("destroy", container.ShortID(), srv.runtime.repositories.ImageName(container.Image))
if removeVolume { if removeVolume {
// Retrieve all volumes from all remaining containers // Retrieve all volumes from all remaining containers
@ -928,7 +928,7 @@ func (srv *Server) deleteImageAndChildren(id string, imgs *[]APIRmi) error {
return err return err
} }
*imgs = append(*imgs, APIRmi{Deleted: utils.TruncateID(id)}) *imgs = append(*imgs, APIRmi{Deleted: utils.TruncateID(id)})
srv.LogEvent("delete", utils.TruncateID(id)) srv.LogEvent("delete", utils.TruncateID(id), "")
return nil return nil
} }
return nil return nil
@ -975,7 +975,7 @@ func (srv *Server) deleteImage(img *Image, repoName, tag string) ([]APIRmi, erro
} }
if tagDeleted { if tagDeleted {
imgs = append(imgs, APIRmi{Untagged: img.ShortID()}) imgs = append(imgs, APIRmi{Untagged: img.ShortID()})
srv.LogEvent("untag", img.ShortID()) srv.LogEvent("untag", img.ShortID(), "")
} }
if len(srv.runtime.repositories.ByID()[img.ID]) == 0 { if len(srv.runtime.repositories.ByID()[img.ID]) == 0 {
if err := srv.deleteImageAndChildren(img.ID, &imgs); err != nil { if err := srv.deleteImageAndChildren(img.ID, &imgs); err != nil {
@ -1042,7 +1042,7 @@ func (srv *Server) ContainerStart(name string, hostConfig *HostConfig) error {
if err := container.Start(hostConfig); err != nil { if err := container.Start(hostConfig); err != nil {
return fmt.Errorf("Error starting container %s: %s", name, err) return fmt.Errorf("Error starting container %s: %s", name, err)
} }
srv.LogEvent("start", name) srv.LogEvent("start", container.ShortID(), srv.runtime.repositories.ImageName(container.Image))
} else { } else {
return fmt.Errorf("No such container: %s", name) return fmt.Errorf("No such container: %s", name)
} }
@ -1054,7 +1054,7 @@ func (srv *Server) ContainerStop(name string, t int) error {
if err := container.Stop(t); err != nil { if err := container.Stop(t); err != nil {
return fmt.Errorf("Error stopping container %s: %s", name, err) return fmt.Errorf("Error stopping container %s: %s", name, err)
} }
srv.LogEvent("stop", name) srv.LogEvent("stop", container.ShortID(), srv.runtime.repositories.ImageName(container.Image))
} else { } else {
return fmt.Errorf("No such container: %s", name) return fmt.Errorf("No such container: %s", name)
} }
@ -1222,9 +1222,9 @@ func (srv *Server) HTTPRequestFactory() *utils.HTTPRequestFactory {
return srv.reqFactory return srv.reqFactory
} }
func (srv *Server) LogEvent(action, id string) { func (srv *Server) LogEvent(action, id, from string) {
now := time.Now().Unix() now := time.Now().Unix()
jm := utils.JSONMessage{Status: action, ID: id, Time: now} jm := utils.JSONMessage{Status: action, ID: id, From: from, Time: now}
srv.events = append(srv.events, jm) srv.events = append(srv.events, jm)
for _, c := range srv.listeners { for _, c := range srv.listeners {
select { // non blocking channel select { // non blocking channel

4
utils/utils.go
View File

@ -622,6 +622,7 @@ type JSONMessage struct {
Progress string `json:"progress,omitempty"` Progress string `json:"progress,omitempty"`
ErrorMessage string `json:"error,omitempty"` //deprecated ErrorMessage string `json:"error,omitempty"` //deprecated
ID string `json:"id,omitempty"` ID string `json:"id,omitempty"`
From string `json:"from,omitempty"`
Time int64 `json:"time,omitempty"` Time int64 `json:"time,omitempty"`
Error *JSONError `json:"errorDetail,omitempty"` Error *JSONError `json:"errorDetail,omitempty"`
} }
@ -650,6 +651,9 @@ func (jm *JSONMessage) Display(out io.Writer) error {
if jm.ID != "" { if jm.ID != "" {
fmt.Fprintf(out, "%s: ", jm.ID) fmt.Fprintf(out, "%s: ", jm.ID)
} }
if jm.From != "" {
fmt.Fprintf(out, "(from %s) ", jm.From)
}
if jm.Progress != "" { if jm.Progress != "" {
fmt.Fprintf(out, "%c[2K", 27) fmt.Fprintf(out, "%c[2K", 27)
fmt.Fprintf(out, "%s %s\r", jm.Status, jm.Progress) fmt.Fprintf(out, "%s %s\r", jm.Status, jm.Progress)