github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-21 22:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

plugins/traffic-control/docker: integrate loopIteration() into Start()

Browse Source 
Move `loopIteration()` code in an anonymous function inside `Start()`.
This commit is contained in:
Alessandro Puccetti
2016-09-09 12:59:07 +02:00
parent 10d33fb24f
commit f2c2ce9d33
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
examples/plugins/traffic-control/docker.go
View File

@@ -29,36 +29,34 @@ func NewDockerClient(store *Store) (*DockerClient, error) {
// Start docker client
func (c *DockerClient) Start() {
for {
c.loopIteration()
func() {
events := make(chan *docker.APIEvents)
if err := c.client.AddEventListener(events); err != nil {
log.Error(err)
return
}
defer func() {
if err := c.client.RemoveEventListener(events); err != nil {
log.Error(err)
}
}()
if err := c.getContainers(); err != nil {
log.Error(err)
return
}
for {
event, ok := <-events
if !ok {
log.Error("event listener unexpectedly disconnected")
return
}
c.handleEvent(event)
}
}()
time.Sleep(time.Second)
}
}
func (c *DockerClient) loopIteration() {
events := make(chan *docker.APIEvents)
if err := c.client.AddEventListener(events); err != nil {
log.Error(err)
return
}
defer func() {
if err := c.client.RemoveEventListener(events); err != nil {
log.Error(err)
}
}()
if err := c.getContainers(); err != nil {
log.Error(err)
return
}
for {
event, ok := <-events
if !ok {
log.Error("event listener unexpectedly disconnected")
return
}
c.handleEvent(event)
}
}
func (c *DockerClient) getContainers() error {
apiContainers, err := c.client.ListContainers(docker.ListContainersOptions{All: true})
if err != nil {