Rename Close to CloseWrite and CloseConnection to Close

Author: ghjm

pkg/netceptor/conn.go

@@ -416,16 +416,16 @@ func (c *Conn) Write(b []byte) (n int, err error) {
 	return c.qs.Write(b)
 }
 
-// Close closes the writer side of the connection.
-func (c *Conn) Close() error {
+// CloseWrite closes the writer side of the connection.
+func (c *Conn) CloseWrite() error {
 	c.doneOnce.Do(func() {
 		close(c.doneChan)
 	})
 
 	return c.qs.Close()
 }
 
-func (c *Conn) CloseConnection() error {
+func (c *Conn) Close() error {
 	c.pc.cancel()
 	c.doneOnce.Do(func() {
 		close(c.doneChan)

pkg/workceptor/remote_work.go

@@ -62,12 +62,12 @@ func (rw *remoteUnit) connectToRemote(ctx context.Context) (net.Conn, *bufio.Rea
 	ctxChild, _ := context.WithTimeout(ctx, 5*time.Second)
 	hello, err := utils.ReadStringContext(ctxChild, reader, '\n')
 	if err != nil {
-		conn.CloseConnection()
+		_ = conn.Close()
 
 		return nil, nil, err
 	}
 	if !strings.Contains(hello, red.RemoteNode) {
-		conn.CloseConnection()
+		_ = conn.Close()
 
 		return nil, nil, fmt.Errorf("while expecting node ID %s, got message: %s", red.RemoteNode,
 			strings.TrimRight(hello, "\n"))
@@ -144,7 +144,7 @@ func (rw *remoteUnit) getConnectionAndRun(ctx context.Context, firstTimeSync boo
 
 // startRemoteUnit makes a single attempt to start a remote unit.
 func (rw *remoteUnit) startRemoteUnit(ctx context.Context, conn net.Conn, reader *bufio.Reader) error {
-	defer conn.(interface{ CloseConnection() error }).CloseConnection()
+	defer conn.Close()
 	red := rw.UnredactedStatus().ExtraData.(*remoteExtraData)
 	workSubmitCmd := make(map[string]interface{})
 	for k, v := range red.RemoteParams {
@@ -195,7 +195,7 @@ func (rw *remoteUnit) startRemoteUnit(ctx context.Context, conn net.Conn, reader
 	if err != nil {
 		return fmt.Errorf("error sending stdin file: %s", err)
 	}
-	err = conn.Close()
+	err = conn.(interface{ CloseWrite() error }).CloseWrite()
 	if err != nil {
 		return fmt.Errorf("error closing stdin file: %s", err)
 	}
@@ -220,7 +220,7 @@ func (rw *remoteUnit) startRemoteUnit(ctx context.Context, conn net.Conn, reader
 func (rw *remoteUnit) cancelOrReleaseRemoteUnit(ctx context.Context, conn net.Conn, reader *bufio.Reader,
 	release bool, force bool,
 ) error {
-	defer conn.(interface{ CloseConnection() error }).CloseConnection()
+	defer conn.Close()
 	red := rw.Status().ExtraData.(*remoteExtraData)
 	var workCmd string
 	if release {
@@ -277,7 +277,7 @@ func (rw *remoteUnit) monitorRemoteStatus(mw *utils.JobContext, forRelease bool)
 	conn, reader := rw.getConnection(mw)
 	defer func() {
 		if conn != nil {
-			conn.(interface{ CloseConnection() error }).CloseConnection()
+			conn.Close()
 		}
 	}()
 	if conn == nil {
@@ -294,15 +294,15 @@ func (rw *remoteUnit) monitorRemoteStatus(mw *utils.JobContext, forRelease bool)
 		_, err := conn.Write([]byte(fmt.Sprintf("work status %s\n", remoteUnitID)))
 		if err != nil {
 			logger.Debug("Write error sending to %s: %s\n", remoteUnitID, err)
-			_ = conn.(interface{ CloseConnection() error }).CloseConnection()
+			_ = conn.Close()
 			conn = nil
 
 			continue
 		}
 		status, err := utils.ReadStringContext(mw, reader, '\n')
 		if err != nil {
 			logger.Debug("Read error reading from %s: %s\n", remoteNode, err)
-			_ = conn.(interface{ CloseConnection() error }).CloseConnection()
+			_ = conn.Close()
 			conn = nil
 
 			continue
@@ -401,7 +401,7 @@ func (rw *remoteUnit) monitorRemoteStdout(mw *utils.JobContext) {
 			conn, reader := rw.getConnection(mw)
 			defer func() {
 				if conn != nil {
-					_ = conn.(interface{ CloseConnection() error }).CloseConnection()
+					_ = conn.Close()
 				}
 			}()
 			if conn == nil {
@@ -461,7 +461,7 @@ func (rw *remoteUnit) monitorRemoteStdout(mw *utils.JobContext) {
 					if ok {
 						cr.CancelRead()
 					}
-					_ = conn.(interface{ CloseConnection() error }).CloseConnection()
+					_ = conn.Close()
 
 					return
 				}