github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-19 04:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use a global variable to store the pipe client.

Browse Source
This commit is contained in:
Tom Wilkie
2015-12-10 15:44:25 +00:00
parent 50be8c61d2
commit 6259307491
7 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/pipes_internal_test.go
+1 -5
View File
@@ -84,12 +84,8 @@ func TestPipeClose(t *testing.T) {
}
defer client.Stop()
oldClient := controls.Client
defer func() { controls.Client = oldClient }()
controls.Client = adapter{client}
// this is the probe end of the pipe
pipeID, pipe, err := controls.NewPipe("appid")
pipeID, pipe, err := controls.NewPipe(adapter{client}, "appid")
if err != nil {
t.Fatal(err)
}
probe/controls/pipes.go
+10 -8
View File
@@ -7,8 +7,8 @@ import (
"github.com/weaveworks/scope/xfer"
)
// Client is the thing the probe uses to make pipe connections.
var Client interface {
// PipeClient is the type of the thing the probe uses to make pipe connections.
type PipeClient interface {
PipeConnection(string, string, xfer.Pipe) error
PipeClose(string, string) error
}
@@ -18,17 +18,19 @@ var Client interface {
type pipe struct {
xfer.Pipe
id, appID string
client PipeClient
}
// NewPipe creats a new pipe and connects it to the app.
var NewPipe = func(appID string) (string, xfer.Pipe, error) {
var NewPipe = func(c PipeClient, appID string) (string, xfer.Pipe, error) {
pipeID := fmt.Sprintf("pipe-%d", rand.Int63())
pipe := &pipe{
Pipe: xfer.NewPipe(),
appID: appID,
id: pipeID,
Pipe: xfer.NewPipe(),
appID: appID,
id: pipeID,
client: c,
}
if err := Client.PipeConnection(appID, pipeID, pipe.Pipe); err != nil {
if err := c.PipeConnection(appID, pipeID, pipe.Pipe); err != nil {
return "", nil, err
}
return pipeID, pipe, nil
@@ -36,7 +38,7 @@ var NewPipe = func(appID string) (string, xfer.Pipe, error) {
func (p *pipe) Close() error {
err1 := p.Pipe.Close()
err2 := Client.PipeClose(p.appID, p.id)
err2 := p.client.PipeClose(p.appID, p.id)
if err1 != nil {
return err1
}
probe/docker/controls.go
+2 -2
View File
@@ -55,7 +55,7 @@ func (r *registry) attachContainer(containerID string, req xfer.Request) xfer.Re
}
hasTTY := c.HasTTY()
id, pipe, err := controls.NewPipe(req.AppID)
id, pipe, err := controls.NewPipe(r.pipes, req.AppID)
if err != nil {
xfer.ResponseError(err)
}
@@ -106,7 +106,7 @@ func (r *registry) execContainer(containerID string, req xfer.Request) xfer.Resp
xfer.ResponseError(err)
}
id, pipe, err := controls.NewPipe(req.AppID)
id, pipe, err := controls.NewPipe(r.pipes, req.AppID)
if err != nil {
xfer.ResponseError(err)
}
probe/docker/controls_test.go
+3 -3
View File
@@ -18,7 +18,7 @@ import (
func TestControls(t *testing.T) {
mdc := newMockClient()
setupStubs(mdc, func() {
registry, _ := docker.NewRegistry(10 * time.Second)
registry, _ := docker.NewRegistry(10*time.Second, nil)
defer registry.Stop()
for _, tc := range []struct{ command, result string }{
@@ -52,13 +52,13 @@ func (mockPipe) OnClose(func()) {}
func TestPipes(t *testing.T) {
oldNewPipe := controls.NewPipe
defer func() { controls.NewPipe = oldNewPipe }()
controls.NewPipe = func(_ string) (string, xfer.Pipe, error) {
controls.NewPipe = func(_ controls.PipeClient, _ string) (string, xfer.Pipe, error) {
return "pipeid", mockPipe{}, nil
}
mdc := newMockClient()
setupStubs(mdc, func() {
registry, _ := docker.NewRegistry(10 * time.Second)
registry, _ := docker.NewRegistry(10*time.Second, nil)
defer registry.Stop()
test.Poll(t, 100*time.Millisecond, true, func() interface{} {
probe/docker/registry.go
+5 -1
View File
@@ -6,6 +6,8 @@ import (
"time"
docker_client "github.com/fsouza/go-dockerclient"
"github.com/weaveworks/scope/probe/controls"
)
// Consts exported for testing.
@@ -43,6 +45,7 @@ type registry struct {
quit chan chan struct{}
interval time.Duration
client Client
pipes controls.PipeClient
watchers []ContainerUpdateWatcher
containers map[string]Container
@@ -73,7 +76,7 @@ func newDockerClient(endpoint string) (Client, error) {
}
// NewRegistry returns a usable Registry. Don't forget to Stop it.
func NewRegistry(interval time.Duration) (Registry, error) {
func NewRegistry(interval time.Duration, pipes controls.PipeClient) (Registry, error) {
client, err := NewDockerClientStub(endpoint)
if err != nil {
return nil, err
@@ -85,6 +88,7 @@ func NewRegistry(interval time.Duration) (Registry, error) {
images: map[string]*docker_client.APIImages{},
client: client,
pipes: pipes,
interval: interval,
quit: make(chan chan struct{}),
}
probe/docker/registry_test.go
+3 -3
View File
@@ -242,7 +242,7 @@ func allImages(r docker.Registry) []*client.APIImages {
func TestRegistry(t *testing.T) {
mdc := newMockClient()
setupStubs(mdc, func() {
registry, _ := docker.NewRegistry(10 * time.Second)
registry, _ := docker.NewRegistry(10*time.Second, nil)
defer registry.Stop()
runtime.Gosched()
@@ -265,7 +265,7 @@ func TestRegistry(t *testing.T) {
func TestLookupByPID(t *testing.T) {
mdc := newMockClient()
setupStubs(mdc, func() {
registry, _ := docker.NewRegistry(10 * time.Second)
registry, _ := docker.NewRegistry(10*time.Second, nil)
defer registry.Stop()
want := docker.Container(&mockContainer{container1})
@@ -282,7 +282,7 @@ func TestLookupByPID(t *testing.T) {
func TestRegistryEvents(t *testing.T) {
mdc := newMockClient()
setupStubs(mdc, func() {
registry, _ := docker.NewRegistry(10 * time.Second)
registry, _ := docker.NewRegistry(10*time.Second, nil)
defer registry.Stop()
runtime.Gosched()
prog/probe.go
+1 -2
View File
@@ -114,7 +114,6 @@ func probeMain() {
)
})
defer clients.Stop()
controls.Client = clients
resolver := xfer.NewStaticResolver(targets, clients.Set)
defer resolver.Stop()
@@ -136,7 +135,7 @@ func probeMain() {
if err := report.AddLocalBridge(*dockerBridge); err != nil {
log.Printf("Docker: problem with bridge %s: %v", *dockerBridge, err)
}
if registry, err := docker.NewRegistry(*dockerInterval); err == nil {
if registry, err := docker.NewRegistry(*dockerInterval, clients); err == nil {
defer registry.Stop()
p.AddTagger(docker.NewTagger(registry, processCache))
p.AddReporter(docker.NewReporter(registry, hostID, p))