Refactor to use Weave's docker client and watcher
This commit is contained in:
1 parent
068bbe0837
commit
bd2b8df7c5
6 files changed
+25
-42
No files matched your search
+6
-22
@@ -4,19 +4,16 @@ import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/fsouza/go-dockerclient"
|
||||
. "github.com/weaveworks/weave/common"
|
||||
"github.com/weaveworks/weave/common/docker"
|
||||
)
|
||||
|
||||
const (
|
||||
WeaveDNSContainer = "weavedns"
|
||||
WeaveDomain = "weave.local"
|
||||
WeaveDomain = "weave.local"
|
||||
)
|
||||
|
||||
type watcher struct {
|
||||
dockerer
|
||||
networks map[string]bool
|
||||
events chan *docker.APIEvents
|
||||
}
|
||||
|
||||
type Watcher interface {
|
||||
@@ -27,31 +24,18 @@ func NewWatcher(client *docker.Client) (Watcher, error) {
|
||||
dockerer: dockerer{
|
||||
client: client,
|
||||
},
|
||||
networks: make(map[string]bool),
|
||||
events: make(chan *docker.APIEvents),
|
||||
}
|
||||
err := client.AddEventListener(w.events)
|
||||
err := client.AddObserver(w)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
go func() {
|
||||
for event := range w.events {
|
||||
switch event.Status {
|
||||
case "start":
|
||||
w.ContainerStart(event.ID)
|
||||
case "die":
|
||||
w.ContainerDied(event.ID)
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
return w, nil
|
||||
}
|
||||
|
||||
func (w *watcher) ContainerStart(id string) {
|
||||
func (w *watcher) ContainerStarted(id string) {
|
||||
Log.Debugf("Container started %s", id)
|
||||
info, err := w.InspectContainer(id)
|
||||
info, err := w.client.InspectContainer(id)
|
||||
if err != nil {
|
||||
Log.Warningf("error inspecting container: %s", err)
|
||||
return
|
||||
@@ -69,7 +53,7 @@ func (w *watcher) ContainerStart(id string) {
|
||||
|
||||
func (w *watcher) ContainerDied(id string) {
|
||||
Log.Debugf("Container died %s", id)
|
||||
info, err := w.InspectContainer(id)
|
||||
info, err := w.client.InspectContainer(id)
|
||||
if err != nil {
|
||||
Log.Warningf("error inspecting container: %s", err)
|
||||
return
|
||||
|
||||
Reference in new issue
Block a user