opensource/teleport
3
0
Fork 0
mirror of https://github.com/gravitational/teleport.git synced 2026-09-24 16:17:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't log error on tunnel node after its serving agent is stopped (#5042)

Browse Source
This commit is contained in:
Andrej Tokarčík
2020-12-11 17:39:19 +01:00
committed by GitHub
parent ca60c7eb35
commit ee87fce040
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/teleagent/agent.go
+6 -5
View File
@@ -85,10 +85,11 @@ func (a *AgentServer) Serve() error {
return trace.Wrap(err, "unknown error")
}
if !neterr.Temporary() {
if !strings.Contains(neterr.Error(), "use of closed network connection") {
log.Errorf("got permanent error: %v", err)
if strings.Contains(neterr.Error(), "use of closed network connection") {
return nil
}
return err
log.WithError(err).Error("Got permanent error.")
return trace.Wrap(err)
}
if tempDelay == 0 {
tempDelay = 5 * time.Millisecond
@@ -98,7 +99,7 @@ func (a *AgentServer) Serve() error {
if max := 1 * time.Second; tempDelay > max {
tempDelay = max
}
log.Errorf("got temp error: %v, will sleep %v", err, tempDelay)
log.WithError(err).Errorf("Got temporary error (will sleep %v).", tempDelay)
time.Sleep(tempDelay)
continue
}
@@ -107,7 +108,7 @@ func (a *AgentServer) Serve() error {
// get an agent instance for serving this conn
instance, err := a.getAgent()
if err != nil {
log.Errorf("Failed to get agent: %v", err)
log.WithError(err).Error("Failed to get agent.")
return trace.Wrap(err)
}