mirror/syncthing
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2026-05-24 17:05:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

all: Remove or convert deprecated API usages (#8459)

Browse Source
This commit is contained in:
Jakob Borg
2022-07-28 17:14:49 +02:00
committed by GitHub
parent 7e26f74f38
commit 7bdb5faa9c
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/strelaypoolsrv/stats.go
View File

@@ -10,11 +10,12 @@ import (
"time"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/collectors"
"github.com/syncthing/syncthing/lib/sync"
)
func init() {
processCollectorOpts := prometheus.ProcessCollectorOpts{
processCollectorOpts := collectors.ProcessCollectorOpts{
Namespace: "syncthing_relaypoolsrv",
PidFn: func() (int, error) {
return os.Getpid(), nil
@@ -22,7 +23,7 @@ func init() {
}
prometheus.MustRegister(
prometheus.NewProcessCollector(processCollectorOpts),
collectors.NewProcessCollector(processCollectorOpts),
)
}

2
cmd/strelaysrv/listener.go
View File

@@ -76,7 +76,7 @@ func protocolConnectionHandler(tcpConn net.Conn, config *tls.Config) {
}
state := conn.ConnectionState()
if (!state.NegotiatedProtocolIsMutual || state.NegotiatedProtocol != protocol.ProtocolName) && debug {
if debug && state.NegotiatedProtocol != protocol.ProtocolName {
log.Println("Protocol negotiation error")
}