From 231381f83ff0b7cb1a32ae133e491ff8d117c368 Mon Sep 17 00:00:00 2001
From: Zac Bergquist <zac.bergquist@goteleport.com>
Date: Thu, 24 Mar 2022 08:53:05 -0600
Subject: [PATCH] Remove call to deprecated neterr.Temporary() method

---
 lib/teleagent/agent.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/teleagent/agent.go b/lib/teleagent/agent.go
index 421642bf401..5d7d44578ff 100644
--- a/lib/teleagent/agent.go
+++ b/lib/teleagent/agent.go
@@ -18,7 +18,6 @@ import (
 	"io"
 	"net"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/gravitational/teleport/lib/utils"
@@ -98,11 +97,11 @@ func (a *AgentServer) Serve() error {
 			if !ok {
 				return trace.Wrap(err, "unknown error")
 			}
-			if !neterr.Temporary() {
-				if strings.Contains(neterr.Error(), "use of closed network connection") {
-					return nil
-				}
-				log.WithError(err).Error("Got permanent error.")
+			if utils.IsUseOfClosedNetworkError(neterr) {
+				return nil
+			}
+			if !neterr.Timeout() {
+				log.WithError(err).Error("Got non-timeout error.")
 				return trace.Wrap(err)
 			}
 			if tempDelay == 0 {
@@ -113,7 +112,7 @@ func (a *AgentServer) Serve() error {
 			if max := 1 * time.Second; tempDelay > max {
 				tempDelay = max
 			}
-			log.WithError(err).Errorf("Got temporary error (will sleep %v).", tempDelay)
+			log.WithError(err).Errorf("Got timeout error (will sleep %v).", tempDelay)
 			time.Sleep(tempDelay)
 			continue
 		}