Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-09-22 05:40:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support --debug flag

Browse source 
Also adds better logging output
This commit is contained in:
Brian DeHamer 2015-07-22 21:58:16 +00:00
parent 3d0c853e42
commit bfed95ecaf
46 changed files with 3418 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
container/client.go
View file

@ -2,10 +2,10 @@ package container
import (
"fmt"
"log"
"strings"
"time"
log "github.com/Sirupsen/logrus"
"github.com/samalba/dockerclient"
)
@ -28,7 +28,7 @@ func NewClient(dockerHost string, pullImages bool) Client {
docker, err := dockerclient.NewDockerClient(dockerHost, nil)
if err != nil {
log.Fatalf("Error instantiating Docker client: %s\n", err)
log.Fatalf("Error instantiating Docker client: %s", err)
}
return DockerClient{api: docker, pullImages: pullImages}
@ -42,17 +42,23 @@ type DockerClient struct {
func (client DockerClient) ListContainers(fn Filter) ([]Container, error) {
cs := []Container{}
log.Debug("Retrieving running containers")
runningContainers, err := client.api.ListContainers(false, false, "")
if err != nil {
return nil, err
}
for _, runningContainer := range runningContainers {
log.Debugf("Inspecting container %s (%s)", runningContainer.Names[0], runningContainer.Id)
containerInfo, err := client.api.InspectContainer(runningContainer.Id)
if err != nil {
return nil, err
}
log.Debugf("Inspecting image %s (%s)", containerInfo.Config.Image, containerInfo.Image)
imageInfo, err := client.api.InspectImage(containerInfo.Image)
if err != nil {
return nil, err
@ -74,7 +80,7 @@ func (client DockerClient) StopContainer(c Container, timeout time.Duration) err
signal = sig
}
log.Printf("Stopping: %s\n", c.Name())
log.Infof("Stopping %s (%s) with %s", c.Name(), c.containerInfo.Id, signal)
if err := client.api.KillContainer(c.containerInfo.Id, signal); err != nil {
return err
@ -83,6 +89,8 @@ func (client DockerClient) StopContainer(c Container, timeout time.Duration) err
// Wait for container to exit, but proceed anyway after the timeout elapses
client.waitForStop(c, timeout)
log.Debugf("Removing container %s", c.containerInfo.Id)
return client.api.RemoveContainer(c.containerInfo.Id, true, false)
}
@ -91,21 +99,20 @@ func (client DockerClient) StartContainer(c Container) error {
hostConfig := c.hostConfig()
name := c.Name()
if name == "" {
log.Printf("Starting new container from %s", c.containerInfo.Config.Image)
} else {
log.Printf("Starting %s\n", name)
}
log.Infof("Starting %s", name)
newContainerID, err := client.api.CreateContainer(config, name)
if err != nil {
return err
}
log.Debugf("Starting container %s (%s)", name, newContainerID)
return client.api.StartContainer(newContainerID, hostConfig)
}
func (client DockerClient) RenameContainer(c Container, newName string) error {
log.Debugf("Renaming container %s (%s) to %s", c.Name(), c.containerInfo.Id, newName)
return client.api.RenameContainer(c.containerInfo.Id, newName)
}
@ -119,7 +126,7 @@ func (client DockerClient) IsContainerStale(c Container) (bool, error) {
imageName = fmt.Sprintf("%s:latest", imageName)
}
log.Printf("Pulling %s for %s\n", imageName, c.Name())
log.Debugf("Pulling %s for %s", imageName, c.Name())
if err := client.api.PullImage(imageName, nil); err != nil {
return false, err
}
@ -131,7 +138,7 @@ func (client DockerClient) IsContainerStale(c Container) (bool, error) {
}
if newImageInfo.Id != oldImageInfo.Id {
log.Printf("Found new %s image (%s)\n", imageName, newImageInfo.Id)
log.Infof("Found new %s image (%s)", imageName, newImageInfo.Id)
return true, nil
}

14
container/client_test.go
View file

@ -15,10 +15,10 @@ func allContainers(Container) bool { return true }
func noContainers(Container) bool { return false }
func TestListContainers_Success(t *testing.T) {
ci := &dockerclient.ContainerInfo{Image: "abc123"}
ci := &dockerclient.ContainerInfo{Image: "abc123", Config: &dockerclient.ContainerConfig{Image: "img"}}
ii := &dockerclient.ImageInfo{}
api := mockclient.NewMockClient()
api.On("ListContainers", false, false, "").Return([]dockerclient.Container{{Id: "foo"}}, nil)
api.On("ListContainers", false, false, "").Return([]dockerclient.Container{{Id: "foo", Names: []string{"bar"}}}, nil)
api.On("InspectContainer", "foo").Return(ci, nil)
api.On("InspectImage", "abc123").Return(ii, nil)
@ -33,10 +33,10 @@ func TestListContainers_Success(t *testing.T) {
}
func TestListContainers_Filter(t *testing.T) {
ci := &dockerclient.ContainerInfo{Image: "abc123"}
ci := &dockerclient.ContainerInfo{Image: "abc123", Config: &dockerclient.ContainerConfig{Image: "img"}}
ii := &dockerclient.ImageInfo{}
api := mockclient.NewMockClient()
api.On("ListContainers", false, false, "").Return([]dockerclient.Container{{Id: "foo"}}, nil)
api.On("ListContainers", false, false, "").Return([]dockerclient.Container{{Id: "foo", Names: []string{"bar"}}}, nil)
api.On("InspectContainer", "foo").Return(ci, nil)
api.On("InspectImage", "abc123").Return(ii, nil)
@ -62,7 +62,7 @@ func TestListContainers_ListError(t *testing.T) {
func TestListContainers_InspectContainerError(t *testing.T) {
api := mockclient.NewMockClient()
api.On("ListContainers", false, false, "").Return([]dockerclient.Container{{Id: "foo"}}, nil)
api.On("ListContainers", false, false, "").Return([]dockerclient.Container{{Id: "foo", Names: []string{"bar"}}}, nil)
api.On("InspectContainer", "foo").Return(&dockerclient.ContainerInfo{}, errors.New("uh-oh"))
client := DockerClient{api: api}
@ -74,10 +74,10 @@ func TestListContainers_InspectContainerError(t *testing.T) {
}
func TestListContainers_InspectImageError(t *testing.T) {
ci := &dockerclient.ContainerInfo{Image: "abc123"}
ci := &dockerclient.ContainerInfo{Image: "abc123", Config: &dockerclient.ContainerConfig{Image: "img"}}
ii := &dockerclient.ImageInfo{}
api := mockclient.NewMockClient()
api.On("ListContainers", false, false, "").Return([]dockerclient.Container{{Id: "foo"}}, nil)
api.On("ListContainers", false, false, "").Return([]dockerclient.Container{{Id: "foo", Names: []string{"bar"}}}, nil)
api.On("InspectContainer", "foo").Return(ci, nil)
api.On("InspectImage", "abc123").Return(ii, errors.New("whoops"))