feat(env): add thread-safe writers for stdout and stderr

Author: qwenode

e/env.go

@@ -1,8 +1,10 @@
 package e
 
 import (
+    "io"
     "os"
     "strings"
+    "sync"
 
     "github.com/rs/zerolog"
     "github.com/rs/zerolog/log"
@@ -13,6 +15,24 @@ var (
     V = Configure{}
 )
 
+// SyncWriter 是一个线程安全的 writer，用于防止并发写入时输出混乱
+type SyncWriter struct {
+    mu sync.Mutex
+    w  io.Writer
+}
+
+func (sw *SyncWriter) Write(p []byte) (n int, err error) {
+    sw.mu.Lock()
+    defer sw.mu.Unlock()
+    return sw.w.Write(p)
+}
+
+// 全局同步 writer，供日志和程序输出共用
+var (
+    StdoutWriter = &SyncWriter{w: os.Stdout}
+    StderrWriter = &SyncWriter{w: os.Stderr}
+)
+
 type (
     Configure struct {
         Log   Log            `mapstructure:"log"`
@@ -40,7 +60,11 @@ type (
 )
 
 func init() {
-    log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout, NoColor: false, TimeFormat: "2006-01-02T15:04:05Z"})
+    log.Logger = log.Output(zerolog.NewConsoleWriter(func(w *zerolog.ConsoleWriter) {
+        w.Out = StderrWriter
+        w.NoColor = false
+        w.TimeFormat = "2006-01-02T15:04:05Z"
+    }))
     viper.SetConfigType("toml")
     viper.SetConfigName("sohot")
     viper.AddConfigPath(".")

watch/watch.go

@@ -8,12 +8,13 @@ import (
     "os/exec"
     "os/signal"
     "path/filepath"
-    "github.com/qwenode/sohot/e"
     "strings"
     "sync"
     "syscall"
     "time"
 
+    "github.com/qwenode/sohot/e"
+
     "github.com/fsnotify/fsnotify"
     "github.com/rs/zerolog/log"
 )
@@ -87,8 +88,8 @@ func Running(input e.Run) {
         log.Err(err).Send()
         return
     }
-    go io.Copy(os.Stdout, stdoutPipe)
-    go io.Copy(os.Stderr, pipe)
+    go io.Copy(e.StdoutWriter, stdoutPipe)
+    go io.Copy(e.StderrWriter, pipe)
     // 捕获 cmd 的本地副本，避免竞态条件
     go func(runCmd *exec.Cmd) {
         <-stopRunning