move to dial

Author: DifferentialOrange

connection.go

@@ -442,16 +442,6 @@ func Connect(addr string, opts Opts) (conn *Connection, err error) {
 		}
 	}
 
-	// Subscribe shutdown event to process graceful shutdown.
-	if conn.isFeatureInSlice(WatchersFeature, conn.serverProtocolInfo.Features) {
-		watcher, werr := conn.newWatcherImpl(shutdownEventKey, shutdownEventCallback)
-		if werr != nil {
-			conn.closeConnection(werr, true)
-			return nil, werr
-		}
-		conn.shutdownWatcher = watcher
-	}
-
 	return conn, err
 }
 
@@ -625,6 +615,15 @@ func (conn *Connection) dial() (err error) {
 	go conn.writer(w, connection)
 	go conn.reader(r, connection)
 
+	// Subscribe shutdown event to process graceful shutdown.
+	if conn.shutdownWatcher == nil && conn.isFeatureInSlice(WatchersFeature, conn.serverProtocolInfo.Features) {
+		watcher, werr := conn.newWatcherImpl(shutdownEventKey, shutdownEventCallback)
+		if werr != nil {
+			return werr
+		}
+		conn.shutdownWatcher = watcher
+	}
+
 	return
 }