From e07b093b1cfdfcab4977658d5ff712653b70e15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Carr=C3=A9?= Date: Mon, 23 Jul 2018 18:50:30 +0200 Subject: [PATCH] Scope now uses signals.SignalHandlerLoop instead of common.* This fixes: ``` prog/app.go:310:2: undefined: "github.com/weaveworks/scope/vendor/github.com/weaveworks/weave/common".SignalHandlerLoop prog/probe.go:309:2: undefined: "github.com/weaveworks/scope/vendor/github.com/weaveworks/weave/common".SignalHandlerLoop ``` --- prog/app.go | 4 ++-- prog/probe.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/prog/app.go b/prog/app.go index 4010fbb43..a01e3c6e6 100644 --- a/prog/app.go +++ b/prog/app.go @@ -21,13 +21,13 @@ import ( "github.com/weaveworks/common/aws" "github.com/weaveworks/common/middleware" "github.com/weaveworks/common/network" + "github.com/weaveworks/common/signals" "github.com/weaveworks/go-checkpoint" "github.com/weaveworks/scope/app" "github.com/weaveworks/scope/app/multitenant" "github.com/weaveworks/scope/common/weave" "github.com/weaveworks/scope/common/xfer" "github.com/weaveworks/scope/probe/docker" - "github.com/weaveworks/weave/common" ) const ( @@ -307,7 +307,7 @@ func appMain(flags appFlags) { }() // block until INT/TERM - common.SignalHandlerLoop() + signals.SignalHandlerLoop() // stop listening, wait for any active connections to finish server.Stop(flags.stopTimeout) <-server.StopChan() diff --git a/prog/probe.go b/prog/probe.go index 901b7028c..0c06ba952 100644 --- a/prog/probe.go +++ b/prog/probe.go @@ -16,6 +16,7 @@ import ( "github.com/weaveworks/common/network" "github.com/weaveworks/common/sanitize" + "github.com/weaveworks/common/signals" "github.com/weaveworks/go-checkpoint" "github.com/weaveworks/scope/common/hostname" "github.com/weaveworks/scope/common/weave" @@ -32,7 +33,6 @@ import ( "github.com/weaveworks/scope/probe/plugins" "github.com/weaveworks/scope/probe/process" "github.com/weaveworks/scope/report" - "github.com/weaveworks/weave/common" ) const ( @@ -306,5 +306,5 @@ func probeMain(flags probeFlags, targets []appclient.Target) { p.Start() defer p.Stop() - common.SignalHandlerLoop() + signals.SignalHandlerLoop() }