gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-16 11:04:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1025 from nats-io/lf

Browse Source 
Cleaned up logging for leafnodes
This commit is contained in:
Derek Collison
2019-05-30 16:04:36 -07:00
committed by GitHub
parent eeffab25db 257b670ae2
commit c188cb092c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/leafnode.go
View File

@@ -153,7 +153,7 @@ func (s *Server) connectToRemoteLeafNode(remote *leafNodeCfg, firstConnect bool)
defer s.grWG.Done()
if remote == nil || remote.URL == nil {
s.Debugf("Empty remote leaf node definition, nothing to connect")
s.Debugf("Empty remote leafnode definition, nothing to connect")
return
}
@@ -166,7 +166,7 @@ func (s *Server) connectToRemoteLeafNode(remote *leafNodeCfg, firstConnect bool)
var conn net.Conn
const connErrFmt = "Error trying to connect as leaf node to remote server (attempt %v): %v"
const connErrFmt = "Error trying to connect as leafnode to remote server (attempt %v): %v"
attempts := 0
for s.isRunning() && s.remoteLeafNodeStillValid(remote) {
@@ -177,7 +177,7 @@ func (s *Server) connectToRemoteLeafNode(remote *leafNodeCfg, firstConnect bool)
if url != rURL.Host {
ipStr = fmt.Sprintf(" (%s)", url)
}
s.Debugf("Trying to connect as leaf node to remote server on %s%s", rURL.Host, ipStr)
s.Debugf("Trying to connect as leafnode to remote server on %s%s", rURL.Host, ipStr)
conn, err = net.DialTimeout("tcp", url, dialTimeout)
}
if err != nil {
@@ -472,8 +472,6 @@ func (s *Server) createLeafNode(conn net.Conn, remote *leafNodeCfg) *client {
c.initClient()
c.Debugf("Leafnode connection created")
if solicited {
// We need to wait here for the info, but not for too long.
c.nc.SetReadDeadline(time.Now().Add(DEFAULT_LEAFNODE_INFO_WAIT))
@@ -553,7 +551,7 @@ func (s *Server) createLeafNode(conn net.Conn, remote *leafNodeCfg) *client {
}
c.sendLeafConnect(tlsRequired)
c.Debugf("Remote leaf node connect msg sent")
c.Debugf("Remote leafnode connect msg sent")
} else {
// Send our info to the other side.
@@ -623,6 +621,8 @@ func (s *Server) createLeafNode(conn net.Conn, remote *leafNodeCfg) *client {
c.sendAllAccountSubs()
}
c.Noticef("Leafnode connection created")
return c
}
@@ -804,7 +804,7 @@ func (c *client) processLeafNodeConnect(s *Server, arg []byte, lang string) erro
func (s *Server) initLeafNodeSmap(c *client) {
acc := c.acc
if acc == nil {
c.Debugf("Leaf node does not have an account bound")
c.Debugf("Leafnode does not have an account bound")
return
}
// Collect all account subs here.

8
server/server_test.go
View File

@@ -1241,8 +1241,8 @@ func TestConnectErrorReports(t *testing.T) {
} {
t.Run(test.name, func(t *testing.T) {
debugExpected := !test.errExpected
checkContent(t, "[DBG] Error trying to connect as leaf node to remote server", test.attempt, debugExpected)
checkContent(t, "[ERR] Error trying to connect as leaf node to remote server", test.attempt, test.errExpected)
checkContent(t, "[DBG] Error trying to connect as leafnode to remote server", test.attempt, debugExpected)
checkContent(t, "[ERR] Error trying to connect as leafnode to remote server", test.attempt, test.errExpected)
})
}
@@ -1415,8 +1415,8 @@ func TestReconnectErrorReports(t *testing.T) {
} {
t.Run(test.name, func(t *testing.T) {
debugExpected := !test.errExpected
checkContent(t, "[DBG] Error trying to connect as leaf node to remote server", test.attempt, debugExpected)
checkContent(t, "[ERR] Error trying to connect as leaf node to remote server", test.attempt, test.errExpected)
checkContent(t, "[DBG] Error trying to connect as leafnode to remote server", test.attempt, debugExpected)
checkContent(t, "[ERR] Error trying to connect as leafnode to remote server", test.attempt, test.errExpected)
})
}