From 41027fa3803d7a18faedea9c118d59821422a1c0 Mon Sep 17 00:00:00 2001
From: ston1th <ston1th@giftfish.de>
Date: Sun, 15 Nov 2020 00:43:34 +0100
Subject: [PATCH] cleanup

---
 cmd/vipman/main.go | 4 ++--
 go.mod             | 1 -
 go.sum             | 3 ---
 pkg/raft/raft.go   | 5 ++++-
 pkg/vip/vip.go     | 7 +++----
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cmd/vipman/main.go b/cmd/vipman/main.go
index b15991d..dc8ed03 100644
--- a/cmd/vipman/main.go
+++ b/cmd/vipman/main.go
@@ -14,8 +14,8 @@ import (
 	"git.giftfish.de/ston1th/vipman/pkg/config"
 	"git.giftfish.de/ston1th/vipman/pkg/raft"
 	"git.giftfish.de/ston1th/vipman/pkg/vip"
-	"k8s.io/klog"
-	"k8s.io/klog/klogr"
+	"k8s.io/klog/v2"
+	"k8s.io/klog/v2/klogr"
 )
 
 var (
diff --git a/go.mod b/go.mod
index 18e301f..cda5aac 100644
--- a/go.mod
+++ b/go.mod
@@ -11,6 +11,5 @@ require (
 	github.com/vishvananda/netlink v1.1.0
 	golang.org/x/sys v0.0.0-20201113233024-12cec1faf1ba // indirect
 	gopkg.in/yaml.v2 v2.3.0
-	k8s.io/klog v1.0.0
 	k8s.io/klog/v2 v2.4.0
 )
diff --git a/go.sum b/go.sum
index f788287..6a3a140 100644
--- a/go.sum
+++ b/go.sum
@@ -15,7 +15,6 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs=
 github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
@@ -91,7 +90,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
 k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
diff --git a/pkg/raft/raft.go b/pkg/raft/raft.go
index ec5c648..cf82225 100644
--- a/pkg/raft/raft.go
+++ b/pkg/raft/raft.go
@@ -217,7 +217,10 @@ func logPanic(r interface{}) {
 }
 
 func (c *Cluster) Stepdown() {
-	c.stepdown <- struct{}{}
+	select {
+	case c.stepdown <- struct{}{}:
+	case <-time.After(time.Second * 2):
+	}
 }
 
 func (c *Cluster) Stop() {
diff --git a/pkg/vip/vip.go b/pkg/vip/vip.go
index 27dab89..ee1a639 100644
--- a/pkg/vip/vip.go
+++ b/pkg/vip/vip.go
@@ -14,10 +14,9 @@ func DefaultInterface() (iface string, err error) {
 		return
 	}
 	if len(routes) >= 1 {
-		link, e := netlink.LinkByIndex(routes[0].LinkIndex)
-		if e != nil {
-			err = e
-			return
+		link, err := netlink.LinkByIndex(routes[0].LinkIndex)
+		if err != nil {
+			return "", err
 		}
 		return link.Attrs().Name, nil
 	}