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

proxy: remove capnslog (#11614)

Browse Source 
* proxy: remove capnslog

* CHANGELOG: function signature change
This commit is contained in:
Jingyi Hu
2020-02-12 10:30:09 -08:00
committed by GitHub
parent 71e3220d36
commit bb29615359
16 changed files with 121 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
proxy/tcpproxy/userspace.go
View File

@@ -22,12 +22,9 @@ import (
"sync"
"time"
"github.com/coreos/pkg/capnslog"
"go.uber.org/zap"
)
var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "proxy/tcpproxy")
type remote struct {
mu sync.Mutex
srv *net.SRV
@@ -88,8 +85,6 @@ func (tp *TCPProxy) Run() error {
}
if tp.Logger != nil {
tp.Logger.Info("ready to proxy client requests", zap.Strings("endpoints", eps))
} else {
plog.Printf("ready to proxy client requests to %+v", eps)
}
go tp.runMonitor()
@@ -181,8 +176,6 @@ func (tp *TCPProxy) serve(in net.Conn) {
remote.inactivate()
if tp.Logger != nil {
tp.Logger.Warn("deactivated endpoint", zap.String("address", remote.addr), zap.Duration("interval", tp.MonitorInterval), zap.Error(err))
} else {
plog.Warningf("deactivated endpoint [%s] due to %v for %v", remote.addr, err, tp.MonitorInterval)
}
}
@@ -215,14 +208,10 @@ func (tp *TCPProxy) runMonitor() {
if err := r.tryReactivate(); err != nil {
if tp.Logger != nil {
tp.Logger.Warn("failed to activate endpoint (stay inactive for another interval)", zap.String("address", r.addr), zap.Duration("interval", tp.MonitorInterval), zap.Error(err))
} else {
plog.Warningf("failed to activate endpoint [%s] due to %v (stay inactive for another %v)", r.addr, err, tp.MonitorInterval)
}
} else {
if tp.Logger != nil {
tp.Logger.Info("activated", zap.String("address", r.addr))
} else {
plog.Printf("activated %s", r.addr)
}
}
}(rem)