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

Merge pull request #611 from nats-io/error_logging

Browse Source 
[IMPROVED] Use correct log level for route errors
This commit is contained in:
Ivan Kozlovic
2017-12-11 09:04:07 -07:00
committed by GitHub
parent b002db4a1c 379701758c
commit ee7b97e6ee
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/route.go
View File

@@ -241,7 +241,7 @@ func (s *Server) processImplicitRoute(info *Info) {
// Initiate the connection, using info.IP instead of info.URL here...
r, err := url.Parse(info.IP)
if err != nil {
s.Debugf("Error parsing URL from INFO: %v\n", err)
s.Errorf("Error parsing URL from INFO: %v\n", err)
return
}
@@ -341,8 +341,6 @@ func (s *Server) createRoute(conn net.Conn, rURL *url.URL) *client {
// Initialize
c.initClient()
c.Debugf("Route connection created")
if didSolicit {
// Do this before the TLS code, otherwise, in case of failure
// and if route is explicit, it would try to reconnect to 'nil'...
@@ -375,7 +373,7 @@ func (s *Server) createRoute(conn net.Conn, rURL *url.URL) *client {
c.mu.Unlock()
if err := conn.Handshake(); err != nil {
c.Debugf("TLS route handshake error: %v", err)
c.Errorf("TLS route handshake error: %v", err)
c.sendErr("Secure Connection - TLS Required")
c.closeConnection()
return nil
@@ -446,6 +444,7 @@ func (s *Server) createRoute(conn net.Conn, rURL *url.URL) *client {
c.mu.Unlock()
c.Noticef("Route connection created")
return c
}
@@ -738,7 +737,7 @@ func (s *Server) connectToRoute(rURL *url.URL, tryForEver bool) {
s.Debugf("Trying to connect to route on %s", rURL.Host)
conn, err := net.DialTimeout("tcp", rURL.Host, DEFAULT_ROUTE_DIAL)
if err != nil {
s.Debugf("Error trying to connect to route: %v", err)
s.Errorf("Error trying to connect to route: %v", err)
if !tryForEver {
if opts.Cluster.ConnectRetries <= 0 {
return