Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12786 from ptabor/20210318-debug-env

Browse Source 
client: Bring back ETCD_CLIENT_DEBUG variable interpretation.
This commit is contained in:
Piotr Tabor
2021-03-18 21:55:51 +01:00
committed by GitHub
parent 0a02a107ea e2b5835e64
commit 18321a0c85
14 changed files with 75 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/integration/clientv3/logger_test.go
View File

@@ -1,27 +0,0 @@
// Copyright 2016 The etcd Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package clientv3test
import (
"io/ioutil"
"go.etcd.io/etcd/client/v3"
"google.golang.org/grpc/grpclog"
)
func init() {
clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
}

6
tests/integration/cluster.go
View File

@@ -777,7 +777,11 @@ func NewClientV3(m *member) (*clientv3.Client, error) {
if m.DialOptions != nil {
cfg.DialOptions = append(cfg.DialOptions, m.DialOptions...)
}
return newClientV3(cfg)
c, err := newClientV3(cfg)
if err != nil {
return nil, err
}
return c.WithLogger(m.Logger.Named("client")), nil
}
// Clone returns a member with the same server configuration. The returned

27
tests/integration/logger_test.go
View File

@@ -1,27 +0,0 @@
// Copyright 2016 The etcd Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package integration
import (
"io/ioutil"
"go.etcd.io/etcd/client/v3"
"google.golang.org/grpc/grpclog"
)
func init() {
clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
}

8
tests/integration/v2store/store_tag_v2v3_test.go
View File

@@ -18,21 +18,13 @@
package v2store_test
import (
"io/ioutil"
"testing"
"go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2store"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2v3"
"go.etcd.io/etcd/tests/v3/integration"
"google.golang.org/grpc/grpclog"
)
func init() {
clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
}
type v2v3TestStore struct {
v2store.Store
clus *integration.ClusterV3