github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-18 03:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update import statements to use sirupsen/logrus.

Browse Source 
Commands run:
```
$ git grep -l Sirupsen | grep -v vendor | xargs sed -i 's:github.com/Sirupsen/logrus:github.com/sirupsen/logrus:g'
$ gofmt -s -w app
$ gofmt -s -w common
$ gofmt -s -w probe
$ gofmt -s -w prog
$ gofmt -s -w tools
```
N.B.: following this commit, build fails with:
```
vendor/github.com/docker/docker/pkg/archive/archive.go:20:2: cannot find package "github.com/Sirupsen/logrus" in any of:
	/go/src/github.com/weaveworks/scope/vendor/github.com/Sirupsen/logrus (vendor tree)
	/usr/local/go/src/github.com/Sirupsen/logrus (from $GOROOT)
	/go/src/github.com/Sirupsen/logrus (from $GOPATH)
```
Resolution in subsequent commit.
This commit is contained in:
Marc CARRE
2017-10-20 11:47:28 +01:00
parent 80f8db5fa1
commit ed4e8aa374
40 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api_topologies.go
+1 -1
View File
@@ -9,8 +9,8 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"github.com/weaveworks/scope/probe/docker"
app/api_topology.go
+1 -1
View File
@@ -4,8 +4,8 @@ import (
"net/http"
"time"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"github.com/weaveworks/scope/common/xfer"
app/controls.go
+1 -1
View File
@@ -4,8 +4,8 @@ import (
"net/http"
"net/rpc"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
log "github.com/sirupsen/logrus"
"github.com/ugorji/go/codec"
"golang.org/x/net/context"
app/multitenant/aws_collector.go
+1 -1
View File
@@ -8,7 +8,6 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/session"
@@ -16,6 +15,7 @@ import (
"github.com/bluele/gcache"
"github.com/nats-io/nats"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"github.com/weaveworks/common/instrument"
app/multitenant/billing_emitter.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"strings"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
billing "github.com/weaveworks/billing-client"
"golang.org/x/net/context"
app/multitenant/consul_client.go
+1 -1
View File
@@ -6,8 +6,8 @@ import (
"fmt"
"time"
log "github.com/Sirupsen/logrus"
consul "github.com/hashicorp/consul/api"
log "github.com/sirupsen/logrus"
)
const (
app/multitenant/consul_pipe_router.go
+1 -1
View File
@@ -8,9 +8,9 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/gorilla/websocket"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"github.com/weaveworks/common/mtime"
app/multitenant/memcache_client.go
+1 -1
View File
@@ -7,9 +7,9 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/bradfitz/gomemcache/memcache"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"github.com/weaveworks/common/instrument"
app/multitenant/sqs_control_router.go
+1 -1
View File
@@ -8,11 +8,11 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sqs"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"github.com/weaveworks/common/instrument"
app/pipe_router.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"github.com/weaveworks/common/mtime"
app/pipes.go
+1 -1
View File
@@ -3,8 +3,8 @@ package app
import (
"net/http"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"github.com/weaveworks/scope/common/xfer"
app/router.go
+1 -1
View File
@@ -12,8 +12,8 @@ import (
"time"
"github.com/PuerkitoBio/ghost/handlers"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
log "github.com/sirupsen/logrus"
"github.com/ugorji/go/codec"
"golang.org/x/net/context"
app/server_helpers.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"github.com/ugorji/go/codec"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
func respondWith(w http.ResponseWriter, code int, response interface{}) {
common/xfer/websocket.go
+1 -1
View File
@@ -6,8 +6,8 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/websocket"
log "github.com/sirupsen/logrus"
"github.com/ugorji/go/codec"
"github.com/weaveworks/common/mtime"
probe/appclient/app_client.go
+1 -1
View File
@@ -11,9 +11,9 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/websocket"
"github.com/hashicorp/go-cleanhttp"
log "github.com/sirupsen/logrus"
"github.com/ugorji/go/codec"
"github.com/weaveworks/scope/common/xfer"
probe/appclient/multi_client.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"strings"
"sync"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/scope/common/xfer"
"github.com/weaveworks/scope/report"
probe/appclient/resolver.go
+1 -1
View File
@@ -7,8 +7,8 @@ import (
"strings"
"time"
log "github.com/Sirupsen/logrus"
"github.com/miekg/dns"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/scope/common/xfer"
)
probe/awsecs/client.go
+1 -1
View File
@@ -6,12 +6,12 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ecs"
"github.com/bluele/gcache"
log "github.com/sirupsen/logrus"
)
const servicePrefix = "ecs-svc" // Task StartedBy field begins with this if it was started by a service
probe/awsecs/reporter.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/scope/common/xfer"
"github.com/weaveworks/scope/probe/controls"
"github.com/weaveworks/scope/probe/docker"
probe/docker/container.go
+1 -1
View File
@@ -9,8 +9,8 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
docker "github.com/fsouza/go-dockerclient"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/common/mtime"
"github.com/weaveworks/scope/report"
probe/docker/controls.go
+1 -1
View File
@@ -3,7 +3,7 @@ package docker
import (
docker_client "github.com/fsouza/go-dockerclient"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/scope/common/xfer"
"github.com/weaveworks/scope/probe/controls"
probe/docker/registry.go
+1 -1
View File
@@ -6,9 +6,9 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/armon/go-radix"
docker_client "github.com/fsouza/go-dockerclient"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/scope/probe/controls"
"github.com/weaveworks/scope/report"
probe/endpoint/connection_tracker.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"strconv"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/scope/probe/endpoint/procspy"
"github.com/weaveworks/scope/probe/process"
"github.com/weaveworks/scope/report"
probe/endpoint/conntrack.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"time"
"unicode"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/common/exec"
)
probe/endpoint/dns_snooper_linux_amd64.go
+1 -1
View File
@@ -8,11 +8,11 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/bluele/gcache"
"github.com/google/gopacket"
"github.com/google/gopacket/layers"
"github.com/google/gopacket/pcap"
log "github.com/sirupsen/logrus"
)
const (
probe/endpoint/ebpf.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"sync"
"syscall"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/common/fs"
"github.com/weaveworks/scope/probe/endpoint/procspy"
"github.com/weaveworks/scope/probe/host"
probe/endpoint/procspy/proc_linux.go
+1 -1
View File
@@ -10,8 +10,8 @@ import (
"syscall"
"time"
log "github.com/Sirupsen/logrus"
"github.com/armon/go-metrics"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/common/fs"
"github.com/weaveworks/scope/common/marshal"
probe/endpoint/procspy/reader_linux.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/scope/probe/process"
)
probe/host/controls.go
+1 -1
View File
@@ -3,9 +3,9 @@ package host
import (
"os/exec"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/term"
"github.com/kr/pty"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/scope/common/xfer"
"github.com/weaveworks/scope/probe/controls"
probe/host/controls_linux.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings"
"syscall"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/willdonnelly/passwd"
)
probe/kubernetes/client.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/weaveworks/common/backoff"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/types"
probe/kubernetes/reporter.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/common/mtime"
"github.com/weaveworks/scope/probe"
"github.com/weaveworks/scope/probe/controls"
probe/plugins/registry.go
+1 -1
View File
@@ -14,7 +14,7 @@ import (
"syscall"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/ugorji/go/codec"
"golang.org/x/net/context"
"golang.org/x/net/context/ctxhttp"
probe/probe.go
+1 -1
View File
@@ -4,8 +4,8 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/armon/go-metrics"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/scope/probe/appclient"
"github.com/weaveworks/scope/report"
prog/app.go
+1 -1
View File
@@ -12,9 +12,9 @@ import (
"strings"
"time"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"
"github.com/tylerb/graceful"
billing "github.com/weaveworks/billing-client"
prog/main.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"strings"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
billing "github.com/weaveworks/billing-client"
"github.com/weaveworks/scope/app"
prog/main_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"flag"
"testing"
"github.com/Sirupsen/logrus/hooks/test"
"github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert"
)
prog/probe.go
+1 -1
View File
@@ -10,9 +10,9 @@ import (
"strconv"
"time"
log "github.com/Sirupsen/logrus"
"github.com/armon/go-metrics"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/common/network"
"github.com/weaveworks/common/sanitize"
report/marshal.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"path/filepath"
"strings"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/ugorji/go/codec"
)
report/table.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/weaveworks/common/mtime"
)