Comment defer again

Signed-off-by: Atanas Alexandrov <sirakov@gmail.com>
kcp-dev · Nov 13, 2024 · 8506642 · 8506642
1 parent 97074e5
commit 8506642
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/cmd/sharded-test-server/cache.go b/cmd/sharded-test-server/cache.go
@@ -30,13 +30,11 @@ import (
 	"github.com/abiosoft/lineprefix"
 	"github.com/fatih/color"
 
-	"k8s.io/client-go/tools/clientcmd"
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-	"k8s.io/klog/v2"
-
 	"github.com/kcp-dev/kcp/cmd/test-server/helpers"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
 	"github.com/kcp-dev/kcp/test/e2e/framework"
+	"k8s.io/client-go/tools/clientcmd"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 )
 
 func startCacheServer(ctx context.Context, logDirPath, workingDir string, syntheticDelay time.Duration) (<-chan error, string, error) {
@@ -73,13 +71,13 @@ func startCacheServer(ctx context.Context, logDirPath, workingDir string, synthe
 		return nil, "", err
 	}
 
-	logger := klog.FromContext(ctx)
-	defer func() {
-		err = logFile.Close()
-		if err != nil {
-			logger.Error(err, "failed to close the log file")
-		}
-	}()
+	// logger := klog.FromContext(ctx)
+	// defer func() {
+	// 	err = logFile.Close()
+	// 	if err != nil {
+	// 		logger.Error(err, "failed to close the log file")
+	// 	}
+	// }()
 
 	writer := helpers.NewHeadWriter(logFile, out)
 	cmd.Stdout = writer

diff --git a/cmd/test-server/kcp/shard.go b/cmd/test-server/kcp/shard.go
@@ -117,12 +117,12 @@ func (s *Shard) Start(ctx context.Context, quiet bool) error {
 		return err
 	}
 
-	defer func() {
-		err = logFile.Close()
-		if err != nil {
-			logger.Error(err, "failed to close the log file")
-		}
-	}()
+	// defer func() {
+	// 	err = logFile.Close()
+	// 	if err != nil {
+	// 		logger.Error(err, "failed to close the log file")
+	// 	}
+	// }()
 
 	s.writer = helpers.NewHeadWriter(logFile, out)
 	cmd.Stdout = s.writer