Skip to content

Commit b0e39f9

Browse files
author
Eric Ernst
authored
Merge pull request kata-containers#303 from bergwolf/agent_quit
agent: do not quit on grpc serve errors
2 parents f9b405e + 815f831 commit b0e39f9

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

agent.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"errors"
1212
"flag"
1313
"fmt"
14-
"io"
1514
"io/ioutil"
1615
"net"
1716
"os"
@@ -632,7 +631,7 @@ func (s *sandbox) startGRPC() {
632631
defer s.wg.Done()
633632

634633
var err error
635-
for err == nil || err == io.EOF {
634+
for {
636635
agentLog.Info("agent grpc server starts")
637636

638637
err = s.channel.setup()
@@ -660,9 +659,9 @@ func (s *sandbox) startGRPC() {
660659
agentLog.WithError(err).Warn("agent grpc server quits")
661660
}
662661

663-
errT := s.channel.teardown()
664-
if errT != nil {
665-
agentLog.WithError(errT).Warn("agent grpc channel teardown failed")
662+
err = s.channel.teardown()
663+
if err != nil {
664+
agentLog.WithError(err).Warn("agent grpc channel teardown failed")
666665
}
667666
}
668667
}()

0 commit comments

Comments
 (0)