ソースを参照

修复日志格式和移除未使用导入

修正了logger.go中的警告信息格式,并在data.go中将输出从os.Stderr更改为传入的writer。同时,移除了未使用的"os"导入。此外,重命名了几个文件以更好地反映其功能。
SongZihuan 3 ヶ月 前
コミット
3431258a38
5 ファイル変更4 行追加5 行削除
  1. 0 0
      src/config/main.go
  2. 2 3
      src/flagparser/data.go
  3. 0 0
      src/flagparser/main.go
  4. 2 2
      src/logger/logger.go
  5. 0 0
      src/logger/main.go

+ 0 - 0
src/config/export.go → src/config/main.go


+ 2 - 3
src/flagparser/data.go

@@ -6,7 +6,6 @@ import (
 	resource "github.com/SongZihuan/huan-proxy"
 	"github.com/SongZihuan/huan-proxy/src/utils"
 	"io"
-	"os"
 	"reflect"
 	"strings"
 )
@@ -327,7 +326,7 @@ func (d *flagData) PrintLicense() (int, error) {
 func (d *flagData) FprintReport(writer io.Writer) (int, error) {
 	// 不需要title
 	report := utils.FormatTextToWidth(resource.Report, utils.NormalConsoleWidth)
-	return fmt.Fprintf(os.Stderr, "%s\n", report)
+	return fmt.Fprintf(writer, "%s\n", report)
 }
 
 func (d *flagData) PrintReport() (int, error) {
@@ -335,7 +334,7 @@ func (d *flagData) PrintReport() (int, error) {
 }
 
 func (d *flagData) FprintLF(writer io.Writer) (int, error) {
-	return fmt.Fprintf(os.Stderr, "\n")
+	return fmt.Fprintf(writer, "\n")
 }
 
 func (d *flagData) PrintLF() (int, error) {

+ 0 - 0
src/flagparser/export.go → src/flagparser/main.go


+ 2 - 2
src/logger/logger.go

@@ -200,7 +200,7 @@ func (l *Logger) Warn(args ...interface{}) {
 	}
 
 	str := fmt.Sprint(args...)
-	_, _ = fmt.Fprintf(l.warnWriter, "[Warning %s]: %\ns", l.args0Name, str)
+	_, _ = fmt.Fprintf(l.warnWriter, "[Warning %s]: %s\n", l.args0Name, str)
 }
 
 func (l *Logger) Error(args ...interface{}) {
@@ -256,7 +256,7 @@ func (l *Logger) WarnWrite(msg string) {
 		return
 	}
 
-	_, _ = fmt.Fprintf(l.warnWriter, "[Warning %s]: %\ns", l.args0Name, msg)
+	_, _ = fmt.Fprintf(l.warnWriter, "[Warning %s]: %s\n", l.args0Name, msg)
 }
 
 func (l *Logger) ErrorWrite(msg string) {

+ 0 - 0
src/logger/export.go → src/logger/main.go