summaryrefslogtreecommitdiff
path: root/internal/failover
diff options
context:
space:
mode:
Diffstat (limited to 'internal/failover')
-rw-r--r--internal/failover/monitor.go5
-rw-r--r--internal/failover/ping.go8
-rw-r--r--internal/failover/ping_default.go4
-rw-r--r--internal/failover/ping_windows.go3
4 files changed, 9 insertions, 11 deletions
diff --git a/internal/failover/monitor.go b/internal/failover/monitor.go
index 2219fc4..987cce6 100644
--- a/internal/failover/monitor.go
+++ b/internal/failover/monitor.go
@@ -1,11 +1,12 @@
package failover
import (
+ "fmt"
"context"
+ "errors"
"time"
"github.com/eduvpn/eduvpn-common/internal/log"
- "github.com/go-errors/errors"
)
// The DroppedConMon is a connection monitor that checks for an increase in rx bytes in certain intervals
@@ -91,7 +92,7 @@ func (m *DroppedConMon) Start(ctx context.Context, gateway string, mtuSize int)
case <-ticker.C:
continue
case <-ctx.Done():
- return false, errors.WrapPrefix(context.Canceled, "failover was stopped", 0)
+ return false, fmt.Errorf("failover was stopped with error: %w", context.Canceled)
}
}
diff --git a/internal/failover/ping.go b/internal/failover/ping.go
index fb1df4e..3b5faa8 100644
--- a/internal/failover/ping.go
+++ b/internal/failover/ping.go
@@ -8,8 +8,6 @@ import (
"golang.org/x/net/icmp"
"golang.org/x/net/ipv4"
-
- "github.com/go-errors/errors"
)
// mtuOverhead defines the total MTU overhead for an ICMP ECHO message: 20 bytes IP header + 8 bytes ICMP header
@@ -41,7 +39,7 @@ func (p Pinger) Read(deadline time.Time) error {
case ipv4.ICMPTypeEchoReply:
return nil
default:
- return errors.Errorf("Not a ping echo reply, got %+v", got)
+ return fmt.Errorf("not a ping echo reply, got: %+v", got)
}
}
@@ -58,12 +56,12 @@ func (p Pinger) Send(seq int) error {
// Marshal the message to bytes
b, err := m.Marshal(nil)
if err != nil {
- return errors.WrapPrefix(err, errorMessage, 0)
+ return fmt.Errorf("%s with error: %w", errorMessage, err)
}
// And send it to the gateway IP!
_, err = p.listener.WriteTo(b, p.gateway)
if err != nil {
- return errors.WrapPrefix(err, errorMessage, 0)
+ return fmt.Errorf("%s with error: %w", errorMessage, err)
}
return nil
diff --git a/internal/failover/ping_default.go b/internal/failover/ping_default.go
index ef56d5e..c490869 100644
--- a/internal/failover/ping_default.go
+++ b/internal/failover/ping_default.go
@@ -3,16 +3,16 @@
package failover
import (
+ "fmt"
"net"
- "github.com/go-errors/errors"
"golang.org/x/net/icmp"
)
func NewPinger(gateway string, size int) (*Pinger, error) {
l, err := icmp.ListenPacket("udp4", "0.0.0.0")
if err != nil {
- return nil, errors.WrapPrefix(err, "failed creating ping", 0)
+ return nil, fmt.Errorf("failed creating ping with error: %w", err)
}
return &Pinger{
listener: l,
diff --git a/internal/failover/ping_windows.go b/internal/failover/ping_windows.go
index 0de1cdf..d6b7703 100644
--- a/internal/failover/ping_windows.go
+++ b/internal/failover/ping_windows.go
@@ -3,14 +3,13 @@ package failover
import (
"net"
- "github.com/go-errors/errors"
"golang.org/x/net/icmp"
)
func NewPinger(gateway string, size int) (*Pinger, error) {
l, err := icmp.ListenPacket("ip4:icmp", "0.0.0.0")
if err != nil {
- return nil, errors.WrapPrefix(err, "failed creating ping", 0)
+ return nil, fmt.Errorf("failed creating ping with error: %w", err)
}
return &Pinger{
listener: l,