Change cap of the err channel.

Author: liqiang-fit2cloud

gotty/server/handlers.go

@@ -5,8 +5,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/patrickmn/go-cache"
 	"github.com/KubeOperator/webkubectl/gotty/pkg/randomstring"
+	"github.com/patrickmn/go-cache"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -49,8 +49,8 @@ func (server *Server) generateHandleWS(ctx context.Context, cancel context.Cance
 		defer func() {
 			num := counter.done()
 			log.Printf(
-				"Connection closed by %s: %s, connections: %d/%d",
-				closeReason, r.RemoteAddr, num, server.options.MaxConnection,
+				"Connection closed: %s, reason: %s, connections: %d/%d",
+				r.RemoteAddr, closeReason, num, server.options.MaxConnection,
 			)
 
 			if server.options.Once {
@@ -89,7 +89,9 @@ func (server *Server) generateHandleWS(ctx context.Context, cancel context.Cance
 		case webtty.ErrSlaveClosed:
 			closeReason = server.factory.Name()
 		case webtty.ErrMasterClosed:
-			closeReason = "client"
+			closeReason = "client close"
+		case webtty.ErrConnectionLostPing:
+			closeReason = webtty.ErrConnectionLostPing.Error()
 		default:
 			closeReason = fmt.Sprintf("an error: %s", err)
 		}

gotty/webtty/errors.go

@@ -10,4 +10,7 @@ var (
 
 	// ErrSlaveClosed is returned when the slave connection is closed.
 	ErrMasterClosed = errors.New("master closed")
+
+	// ErrConnectionLostPing is returned if no ping within a duration
+	ErrConnectionLostPing = errors.New("connection lost ping")
 )

gotty/webtty/webtty.go

@@ -5,7 +5,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"github.com/pkg/errors"
-	"log"
 	"os"
 	"strconv"
 	"sync"
@@ -73,7 +72,7 @@ func (wt *WebTTY) Run(ctx context.Context) error {
 		return errors.Wrapf(err, "failed to send initializing message")
 	}
 
-	errs := make(chan error, 2)
+	errs := make(chan error, 3)
 
 	go func() {
 		errs <- func() error {
@@ -118,11 +117,10 @@ func (wt *WebTTY) Run(ctx context.Context) error {
 			for {
 				time.Sleep(time.Duration(30) * time.Second)
 				if err != nil {
-					return nil
+					return err
 				}
 				if time.Now().After(wt.lastPingTime.Add(lostPingTimeout)) {
-					log.Println("Connection lost ping.")
-					return errors.Wrapf(err, "Connection lost ping.")
+					return ErrConnectionLostPing
 				}
 			}
 		}()