diff --git a/dflog/logger.go b/dflog/logger.go index ca965e7..4bb0af6 100644 --- a/dflog/logger.go +++ b/dflog/logger.go @@ -19,12 +19,10 @@ package dflog import ( "fmt" "os" - "path" "strconv" "go.uber.org/zap" "go.uber.org/zap/zapcore" - "golang.org/x/sys/unix" "google.golang.org/grpc/grpclog" ) @@ -301,27 +299,3 @@ func (z *zapGrpc) Fatalln(args ...any) { func (z *zapGrpc) V(level int) bool { return level <= z.verbose } - -// Redirect stdout and stderr to file for debugging. -func RedirectStdoutAndStderr(console bool, logDir string) { - // When console log is enabled, skip redirect. - if console { - return - } - - // Redirect stdout to stdout.log file. - stdoutPath := path.Join(logDir, "stdout.log") - if stdout, err := os.OpenFile(stdoutPath, os.O_WRONLY|os.O_CREATE|os.O_APPEND|os.O_SYNC, 0644); err != nil { - Warnf("open %s error: %s", stdoutPath, err) - } else if err := unix.Dup2(int(stdout.Fd()), int(os.Stdout.Fd())); err != nil { - Warnf("redirect stdout error: %s", err) - } - - // Redirect stderr to stderr.log file. - stderrPath := path.Join(logDir, "stderr.log") - if stderr, err := os.OpenFile(stderrPath, os.O_WRONLY|os.O_CREATE|os.O_APPEND|os.O_SYNC, 0644); err != nil { - Warnf("open %s error: %s", stderrPath, err) - } else if err := unix.Dup2(int(stderr.Fd()), int(os.Stderr.Fd())); err != nil { - Warnf("redirect stderr error: %s", err) - } -} diff --git a/dflog/loginit.go b/dflog/loginit.go index 8b52e2e..b6f483f 100644 --- a/dflog/loginit.go +++ b/dflog/loginit.go @@ -17,10 +17,10 @@ package dflog import ( + "github.com/urchinfs/sugon-sdk/types" + "go.uber.org/zap" "path" "path/filepath" - "go.uber.org/zap" - "github.com/urchinfs/sugon-sdk/types" ) type logInitMeta struct { diff --git a/dflog/signal.go b/dflog/signal.go index 6db8a69..7699be4 100644 --- a/dflog/signal.go +++ b/dflog/signal.go @@ -33,7 +33,7 @@ var ( func startLoggerSignalHandler() { signals := make(chan os.Signal, 1) - signal.Notify(signals, syscall.SIGUSR1) + signal.Notify(signals, syscall.SIGINT) go func() { for { diff --git a/test.zip b/test.zip deleted file mode 100644 index 689710c..0000000 Binary files a/test.zip and /dev/null differ