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 #1484 from nats-io/cnrace

Browse Source 
Avoid data race on cluster name
This commit is contained in:
Derek Collison
2020-06-18 13:59:40 -07:00
committed by GitHub
parent dc88143b82 c7e4d8b194
commit 05fa11ba2f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/route.go
View File

@@ -353,7 +353,7 @@ func (c *client) processInboundRoutedMsg(msg []byte) {
}
// Lock should be held entering here.
func (c *client) sendRouteConnect(tlsRequired bool) {
func (c *client) sendRouteConnect(clusterName string, tlsRequired bool) {
var user, pass string
if userInfo := c.route.url.User; userInfo != nil {
user = userInfo.Username()
@@ -369,7 +369,7 @@ func (c *client) sendRouteConnect(tlsRequired bool) {
TLS: tlsRequired,
Name: s.info.ID,
Headers: s.supportsHeaders(),
Cluster: s.info.Cluster,
Cluster: clusterName,
Dynamic: s.isClusterNameDynamic(),
}
@@ -1145,6 +1145,7 @@ func (s *Server) createRoute(conn net.Conn, rURL *url.URL) *client {
infoJSON := s.routeInfoJSON
authRequired := s.routeInfo.AuthRequired
tlsRequired := s.routeInfo.TLSRequired
clusterName := s.info.Cluster
s.mu.Unlock()
// Grab lock
@@ -1256,7 +1257,7 @@ func (s *Server) createRoute(conn net.Conn, rURL *url.URL) *client {
// Queue Connect proto if we solicited the connection.
if didSolicit {
c.Debugf("Route connect msg sent")
c.sendRouteConnect(tlsRequired)
c.sendRouteConnect(clusterName, tlsRequired)
}
// Send our info to the other side.