Revert "fix: Use SyscallConn for isTTY which is safe during file close (#167)"

ammario · ammario · commit 5275fa74f12c · 2023-05-30T14:22:15.000-05:00
This reverts commit 2202bcf. See #176
diff --git a/internal/entryhuman/entry.go b/internal/entryhuman/entry.go
@@ -12,7 +12,6 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-	"syscall"
 	"time"
 	"unicode"
 
@@ -226,25 +225,9 @@ func isTTY(w io.Writer) bool {
 	if w == forceColorWriter {
 		return true
 	}
-	// SyscallConn is safe during file close.
-	if sc, ok := w.(interface {
-		SyscallConn() (syscall.RawConn, error)
-	}); ok {
-		conn, err := sc.SyscallConn()
-		if err != nil {
-			return false
-		}
-		var isTerm bool
-		err = conn.Control(func(fd uintptr) {
-			isTerm = terminal.IsTerminal(int(fd))
-		})
-		if err != nil {
-			return false
-		}
-		return isTerm
-	}
-	// Fallback to unsafe Fd.
-	f, ok := w.(interface{ Fd() uintptr })
+	f, ok := w.(interface {
+		Fd() uintptr
+	})
 	return ok && terminal.IsTerminal(int(f.Fd()))
 }
 
diff --git a/internal/entryhuman/entry_test.go b/internal/entryhuman/entry_test.go
@@ -6,7 +6,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"testing"
 	"time"
@@ -179,34 +178,6 @@ func TestEntry(t *testing.T) {
 			assert.Equal(t, "entry matches", string(wantByt), gotBuf.String())
 		})
 	}
-
-	t.Run("isTTY during file close", func(t *testing.T) {
-		t.Parallel()
-
-		tmpdir := t.TempDir()
-		f, err := ioutil.TempFile(tmpdir, "slog")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer f.Close()
-
-		done := make(chan struct{}, 2)
-		go func() {
-			entryhuman.Fmt(new(bytes.Buffer), f, slog.SinkEntry{
-				Level: slog.LevelCritical,
-				Fields: slog.M(
-					slog.F("hey", "hi"),
-				),
-			})
-			done <- struct{}{}
-		}()
-		go func() {
-			_ = f.Close()
-			done <- struct{}{}
-		}()
-		<-done
-		<-done
-	})
 }
 
 func BenchmarkFmt(b *testing.B) {
