simple staticcheck issues

2 files changed, 7 insertions, 3 deletions

diff --git a/server/server_test.go b/server/server_test.go
index 7f854e73..c75003ed 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -169,7 +169,7 @@ func TestMonitor(test *testing.T) {
 		if len(rib.GetKnownPathList("", 0)) > 0 {
 			break
 		}
-		time.Sleep(1)
+		time.Sleep(100 * time.Millisecond)
 	}
 
 	// Test WatchUpdate with "current" flag.
diff --git a/server/sockopt_darwin.go b/server/sockopt_darwin.go
index 47cebe44..4bad54ff 100644
--- a/server/sockopt_darwin.go
+++ b/server/sockopt_darwin.go
@@ -39,19 +39,23 @@ func setsockoptIpTtl(fd int, family int, value int) error {
 
 func setListenTcpTTLSockopt(l *net.TCPListener, ttl int) error {
 	fi, family, err := extractFileAndFamilyFromTCPListener(l)
-	defer fi.Close()
 	if err != nil {
 		return err
 	}
+
+	defer fi.Close()
+
 	return setsockoptIpTtl(int(fi.Fd()), family, ttl)
 }
 
 func setTcpTTLSockopt(conn *net.TCPConn, ttl int) error {
 	fi, family, err := extractFileAndFamilyFromTCPConn(conn)
-	defer fi.Close()
 	if err != nil {
 		return err
 	}
+
+	defer fi.Close()
+
 	return setsockoptIpTtl(int(fi.Fd()), family, ttl)
 }