From 101c1e19355ab7c0e5f69ef70bc5c7025a948ef8 Mon Sep 17 00:00:00 2001 From: Peter Edge Date: Sat, 9 May 2015 01:16:40 +0200 Subject: [PATCH] change log package references to grpc/log --- benchmark/benchmark.go | 2 +- benchmark/client/main.go | 2 +- benchmark/server/main.go | 2 +- clientconn.go | 2 +- examples/route_guide/client/client.go | 2 +- examples/route_guide/server/server.go | 2 +- interop/client/client.go | 2 +- interop/server/server.go | 2 +- server.go | 2 +- test/end2end_test.go | 2 +- transport/http2_client.go | 2 +- transport/http2_server.go | 2 +- transport/http_util.go | 2 +- transport/transport_test.go | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/benchmark/benchmark.go b/benchmark/benchmark.go index 273ca3b9..94745b09 100644 --- a/benchmark/benchmark.go +++ b/benchmark/benchmark.go @@ -38,7 +38,6 @@ package benchmark import ( "io" - "log" "math" "net" "time" @@ -47,6 +46,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" testpb "google.golang.org/grpc/interop/grpc_testing" + "google.golang.org/grpc/log" ) func newPayload(t testpb.PayloadType, size int) *testpb.Payload { diff --git a/benchmark/client/main.go b/benchmark/client/main.go index 4bd87a0e..034439a7 100644 --- a/benchmark/client/main.go +++ b/benchmark/client/main.go @@ -2,7 +2,6 @@ package main import ( "flag" - "log" "math" "net" "net/http" @@ -13,6 +12,7 @@ import ( "google.golang.org/grpc/benchmark" "google.golang.org/grpc/benchmark/stats" testpb "google.golang.org/grpc/interop/grpc_testing" + "google.golang.org/grpc/log" ) var ( diff --git a/benchmark/server/main.go b/benchmark/server/main.go index d24a4478..faf781e7 100644 --- a/benchmark/server/main.go +++ b/benchmark/server/main.go @@ -2,7 +2,6 @@ package main import ( "flag" - "log" "math" "net" "net/http" @@ -10,6 +9,7 @@ import ( "time" "google.golang.org/grpc/benchmark" + "google.golang.org/grpc/log" ) var ( diff --git a/clientconn.go b/clientconn.go index 6080be98..22f98bf2 100644 --- a/clientconn.go +++ b/clientconn.go @@ -35,7 +35,6 @@ package grpc import ( "errors" - "log" "net" "strings" "sync" @@ -43,6 +42,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/log" "google.golang.org/grpc/transport" ) diff --git a/examples/route_guide/client/client.go b/examples/route_guide/client/client.go index dfc19da3..110b100e 100644 --- a/examples/route_guide/client/client.go +++ b/examples/route_guide/client/client.go @@ -40,7 +40,6 @@ package main import ( "flag" "io" - "log" "math/rand" "time" @@ -48,6 +47,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" pb "google.golang.org/grpc/examples/route_guide/proto" + "google.golang.org/grpc/log" ) var ( diff --git a/examples/route_guide/server/server.go b/examples/route_guide/server/server.go index ff421a6f..0757be0c 100644 --- a/examples/route_guide/server/server.go +++ b/examples/route_guide/server/server.go @@ -43,7 +43,6 @@ import ( "fmt" "io" "io/ioutil" - "log" "math" "net" "time" @@ -52,6 +51,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/log" proto "github.com/golang/protobuf/proto" diff --git a/interop/client/client.go b/interop/client/client.go index f310d090..04070e25 100644 --- a/interop/client/client.go +++ b/interop/client/client.go @@ -37,7 +37,6 @@ import ( "flag" "io" "io/ioutil" - "log" "net" "strconv" "strings" @@ -48,6 +47,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" testpb "google.golang.org/grpc/interop/grpc_testing" + "google.golang.org/grpc/log" "google.golang.org/grpc/metadata" ) diff --git a/interop/server/server.go b/interop/server/server.go index d07b4cfe..fdc647b7 100644 --- a/interop/server/server.go +++ b/interop/server/server.go @@ -37,7 +37,6 @@ import ( "flag" "fmt" "io" - "log" "net" "strconv" "time" @@ -47,6 +46,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" testpb "google.golang.org/grpc/interop/grpc_testing" + "google.golang.org/grpc/log" ) var ( diff --git a/server.go b/server.go index c8e677e2..7a363843 100644 --- a/server.go +++ b/server.go @@ -37,7 +37,6 @@ import ( "errors" "fmt" "io" - "log" "net" "reflect" "strings" @@ -45,6 +44,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc/codes" + "google.golang.org/grpc/log" "google.golang.org/grpc/metadata" "google.golang.org/grpc/transport" ) diff --git a/test/end2end_test.go b/test/end2end_test.go index 3d41c610..a611baf6 100644 --- a/test/end2end_test.go +++ b/test/end2end_test.go @@ -36,7 +36,6 @@ package grpc_test import ( "fmt" "io" - "log" "math" "net" "reflect" @@ -51,6 +50,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/log" "google.golang.org/grpc/metadata" testpb "google.golang.org/grpc/test/grpc_testing" ) diff --git a/transport/http2_client.go b/transport/http2_client.go index 5de498fe..a2ac5ae3 100644 --- a/transport/http2_client.go +++ b/transport/http2_client.go @@ -37,7 +37,6 @@ import ( "bytes" "errors" "io" - "log" "math" "net" "sync" @@ -48,6 +47,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/log" "google.golang.org/grpc/metadata" ) diff --git a/transport/http2_server.go b/transport/http2_server.go index ef1a872e..14d56c13 100644 --- a/transport/http2_server.go +++ b/transport/http2_server.go @@ -37,7 +37,6 @@ import ( "bytes" "errors" "io" - "log" "math" "net" "strconv" @@ -47,6 +46,7 @@ import ( "github.com/bradfitz/http2/hpack" "golang.org/x/net/context" "google.golang.org/grpc/codes" + "google.golang.org/grpc/log" "google.golang.org/grpc/metadata" ) diff --git a/transport/http_util.go b/transport/http_util.go index fb67a0d2..95aef703 100644 --- a/transport/http_util.go +++ b/transport/http_util.go @@ -37,7 +37,6 @@ import ( "bufio" "fmt" "io" - "log" "net" "strconv" "sync/atomic" @@ -46,6 +45,7 @@ import ( "github.com/bradfitz/http2" "github.com/bradfitz/http2/hpack" "google.golang.org/grpc/codes" + "google.golang.org/grpc/log" "google.golang.org/grpc/metadata" ) diff --git a/transport/transport_test.go b/transport/transport_test.go index d418420c..0e419623 100644 --- a/transport/transport_test.go +++ b/transport/transport_test.go @@ -36,7 +36,6 @@ package transport import ( "bytes" "io" - "log" "math" "net" "reflect" @@ -49,6 +48,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/log" ) type server struct {