Skip to content

Commit f416544

Browse files
committed
修复proxy 到leader的addr没有移除http前缀导致的连接失败
1 parent 899f64e commit f416544

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

debug/pprof.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"net/http/pprof"
1010
)
1111

12-
var ()
13-
1412
func RunDebug(name string) {
1513

1614
addr, has := env.GetEnv(fmt.Sprintf("PPROF_%s", name))

metrics/metrics.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ func (m *imlMetrics) Metrics(ctx LabelReader) string {
3939
if len(m.readers) == 0 {
4040
return ""
4141
}
42+
4243
builder := bufferPool.Get()
4344
builder.Reset()
4445
defer bufferPool.PUT(builder)

process-master/proxy/leader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ func dialPeer(peers []string) (net.Conn, error) {
3939
for _, peer := range peers {
4040
addr := peer
4141
if strings.HasPrefix(addr, "https://") {
42-
conn, err := tls.Dial("tcp", strings.TrimPrefix(addr, addr[8:]), tlsConf)
42+
conn, err := tls.Dial("tcp", addr[8:], tlsConf)
4343
if err != nil {
4444
log.DebugF("dial peer %s error:%s", addr, err.Error())
4545
continue
4646
}
4747
return conn, nil
4848
}
4949
if strings.HasPrefix(addr, "http://") {
50-
conn, err := net.Dial("tcp", strings.TrimPrefix(addr, addr[7:]))
50+
conn, err := net.Dial("tcp", addr[7:])
5151
if err != nil {
5252
log.DebugF("dial peer %s error:%s", addr, err.Error())
5353
continue

0 commit comments

Comments
 (0)