octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 10:58:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: Replace errors.Cause with errors.Is (#8236)

Browse Source
This commit is contained in:
greatroar 2022-03-26 11:05:57 +01:00 committed by GitHub
parent 44b11ec257
commit 4be867c560
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/connections/service.go
View File

@ -882,7 +882,7 @@ func (s *connectionStatusHandler) ConnectionStatus() map[string]ConnectionStatus
}
func (s *connectionStatusHandler) setConnectionStatus(address string, err error) {
if errors.Cause(err) == context.Canceled {
if errors.Is(err, context.Canceled) {
return
}

2
lib/model/folder_sendrecv.go
View File

@ -1849,7 +1849,7 @@ func (f *sendReceiveFolder) moveForConflict(name, lastModBy string, scanChan cha
}
func (f *sendReceiveFolder) newPullError(path string, err error) {
if errors.Cause(err) == f.ctx.Err() {
if errors.Is(err, f.ctx.Err()) {
// Error because the folder stopped - no point logging/tracking
return
}

6
lib/pmp/pmp.go
View File

@ -8,14 +8,14 @@ package pmp
import (
"context"
"errors"
"fmt"
"net"
"strings"
"time"
"github.com/jackpal/gateway"
"github.com/jackpal/go-nat-pmp"
"github.com/pkg/errors"
natpmp "github.com/jackpal/go-nat-pmp"
"github.com/syncthing/syncthing/lib/nat"
"github.com/syncthing/syncthing/lib/util"
@ -50,7 +50,7 @@ func Discover(ctx context.Context, renewal, timeout time.Duration) []nat.Device
return ierr
})
if err != nil {
if errors.Cause(err) == context.Canceled {
if errors.Is(err, context.Canceled) {
return nil
}
if strings.Contains(err.Error(), "Timed out") {

2
lib/upnp/upnp.go
View File

@ -212,7 +212,7 @@ loop:
case *UnsupportedDeviceTypeError:
l.Debugln(err.Error())
default:
if errors.Cause(err) != context.Canceled {
if !errors.Is(err, context.Canceled) {
l.Infoln("UPnP parse:", err)
}
}