Do not touch grpc logger from within the packages

Libraries should not make process wide changes unless requested to.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure
2017-08-04 09:45:09 -07:00
parent 7e0063320c
commit 16f6e0944a
7 changed files with 20 additions and 20 deletions

View File

@@ -7,7 +7,6 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
"log"
"net"
"os"
"time"
@@ -15,7 +14,6 @@ import (
gocontext "context"
"google.golang.org/grpc"
"google.golang.org/grpc/grpclog"
"github.com/containerd/console"
shim "github.com/containerd/containerd/linux/shim/v1"
@@ -305,8 +303,6 @@ func getShimService(context *cli.Context) (shim.ShimClient, error) {
return nil, errors.New("socket path must be specified")
}
// reset the logger for grpc to log to dev/null so that it does not mess with our stdio
grpclog.SetLogger(log.New(ioutil.Discard, "", log.LstdFlags))
dialOpts := []grpc.DialOption{grpc.WithInsecure(), grpc.WithTimeout(100 * time.Second)}
dialOpts = append(dialOpts,
grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {