diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2018-07-18 18:31:35 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2018-07-18 15:31:35 -0700 |
| commit | cbd3fa4b3ba0e24c6008ac1e501d7a7fe25c1c99 (patch) | |
| tree | 1333a16c5deac7f2add8f856a2a6e1dc4619393c /vendor | |
| parent | 3fcecd521a5c6ccfdb52fb4c3fb1f8c6ea528a4e (diff) | |
| download | chat-cbd3fa4b3ba0e24c6008ac1e501d7a7fe25c1c99.tar.gz chat-cbd3fa4b3ba0e24c6008ac1e501d7a7fe25c1c99.tar.bz2 chat-cbd3fa4b3ba0e24c6008ac1e501d7a7fe25c1c99.zip | |
Lock go-hclog and go-plugin dependencies to a revision (#9128)
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/hashicorp/yamux/session.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vendor/github.com/hashicorp/yamux/session.go b/vendor/github.com/hashicorp/yamux/session.go index d8446fa65..32ba02e02 100644 --- a/vendor/github.com/hashicorp/yamux/session.go +++ b/vendor/github.com/hashicorp/yamux/session.go @@ -309,8 +309,10 @@ func (s *Session) keepalive() { case <-time.After(s.config.KeepAliveInterval): _, err := s.Ping() if err != nil { - s.logger.Printf("[ERR] yamux: keepalive failed: %v", err) - s.exitErr(ErrKeepAliveTimeout) + if err != ErrSessionShutdown { + s.logger.Printf("[ERR] yamux: keepalive failed: %v", err) + s.exitErr(ErrKeepAliveTimeout) + } return } case <-s.shutdownCh: |