kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #5707 from vieux/fix_event_removal

Browse source 
fix event removal
This commit is contained in:
Michael Crosby 2014-05-12 18:59:42 -07:00
commit 5b525feaed
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
server/server.go
View file

@ -198,6 +198,15 @@ func (srv *Server) ContainerKill(job *engine.Job) engine.Status {
return engine.StatusOK return engine.StatusOK
} }
func (srv *Server) EvictListener(from string) {
srv.Lock()
if old, ok := srv.listeners[from]; ok {
delete(srv.listeners, from)
close(old)
}
srv.Unlock()
}
func (srv *Server) Events(job *engine.Job) engine.Status { func (srv *Server) Events(job *engine.Job) engine.Status {
if len(job.Args) != 1 { if len(job.Args) != 1 {
return job.Errorf("Usage: %s FROM", job.Name) return job.Errorf("Usage: %s FROM", job.Name)
@ -215,15 +224,7 @@ func (srv *Server) Events(job *engine.Job) engine.Status {
return fmt.Errorf("JSON error") return fmt.Errorf("JSON error")
} }
_, err = job.Stdout.Write(b) _, err = job.Stdout.Write(b)
if err != nil { return err
// On error, evict the listener
utils.Errorf("%s", err)
srv.Lock()
delete(srv.listeners, from)
srv.Unlock()
return err
}
return nil
} }
listener := make(chan utils.JSONMessage) listener := make(chan utils.JSONMessage)
@ -244,8 +245,9 @@ func (srv *Server) Events(job *engine.Job) engine.Status {
continue continue
} }
if err != nil { if err != nil {
job.Error(err) // On error, evict the listener
return engine.StatusErr srv.EvictListener(from)
return job.Error(err)
} }
} }
} }
@ -263,6 +265,8 @@ func (srv *Server) Events(job *engine.Job) engine.Status {
continue continue
} }
if err != nil { if err != nil {
// On error, evict the listener
srv.EvictListener(from)
return job.Error(err) return job.Error(err)
} }
case <-timeout.C: case <-timeout.C: