mirror of https://github.com/hashicorp/consul
Updates hashicorp/memberlist.
parent
3b9ab553b7
commit
13f89e68c5
|
@ -1,25 +0,0 @@
|
||||||
# Compiled Object files, Static and Dynamic libs (Shared Objects)
|
|
||||||
*.o
|
|
||||||
*.a
|
|
||||||
*.so
|
|
||||||
|
|
||||||
# Folders
|
|
||||||
_obj
|
|
||||||
_test
|
|
||||||
|
|
||||||
# Architecture specific extensions/prefixes
|
|
||||||
*.[568vq]
|
|
||||||
[568vq].out
|
|
||||||
|
|
||||||
*.cgo1.go
|
|
||||||
*.cgo2.c
|
|
||||||
_cgo_defun.c
|
|
||||||
_cgo_gotypes.go
|
|
||||||
_cgo_export.*
|
|
||||||
|
|
||||||
_testmain.go
|
|
||||||
|
|
||||||
*.exe
|
|
||||||
*.test
|
|
||||||
.vagrant/
|
|
||||||
|
|
|
@ -222,7 +222,9 @@ func (m *Memberlist) handleConn(conn *net.TCPConn) {
|
||||||
conn.SetDeadline(time.Now().Add(m.config.TCPTimeout))
|
conn.SetDeadline(time.Now().Add(m.config.TCPTimeout))
|
||||||
msgType, bufConn, dec, err := m.readTCP(conn)
|
msgType, bufConn, dec, err := m.readTCP(conn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
m.logger.Printf("[ERR] memberlist: failed to receive: %s %s", err, LogConn(conn))
|
if err != io.EOF {
|
||||||
|
m.logger.Printf("[ERR] memberlist: failed to receive: %s %s", err, LogConn(conn))
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -344,8 +344,10 @@
|
||||||
"revisionTime": "2015-06-09T07:04:31Z"
|
"revisionTime": "2015-06-09T07:04:31Z"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"checksumSHA1": "8ytOx52G+38QMK4G194Kl6g6YGY=",
|
||||||
"path": "github.com/hashicorp/memberlist",
|
"path": "github.com/hashicorp/memberlist",
|
||||||
"revision": "215aec831f03c9b7c61ac183d3e28fff3c7d3a37"
|
"revision": "b2053e314b4a87e5f0d2d47aeafd3e03be13da90",
|
||||||
|
"revisionTime": "2016-06-21T23:59:43Z"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "github.com/hashicorp/net-rpc-msgpackrpc",
|
"path": "github.com/hashicorp/net-rpc-msgpackrpc",
|
||||||
|
|
Loading…
Reference in New Issue