From ac26c1a8ca5eb03b73422e3c7a3b3b66edc8a957 Mon Sep 17 00:00:00 2001 From: qydysky Date: Sat, 26 Oct 2024 14:55:59 +0800 Subject: [PATCH] EOL --- linuxwin/darwin.go | 2 ++ linuxwin/linux.go | 2 ++ linuxwin/none.go | 2 ++ linuxwin/win.go | 2 ++ log/Log.go | 3 ++- sys/Sys.go | 2 ++ 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/linuxwin/darwin.go b/linuxwin/darwin.go index 3f38dd6..7fc975f 100644 --- a/linuxwin/darwin.go +++ b/linuxwin/darwin.go @@ -13,6 +13,8 @@ import ( signal "github.com/qydysky/part/signal" ) +var EOF = "\n" + func PCheck(pros []string) []int { res := []int{} _pros := [][]byte{} diff --git a/linuxwin/linux.go b/linuxwin/linux.go index 9f21e9f..2779d7a 100755 --- a/linuxwin/linux.go +++ b/linuxwin/linux.go @@ -13,6 +13,8 @@ import ( signal "github.com/qydysky/part/signal" ) +var EOF = "\n" + func PCheck(pros []string) []int { res := []int{} _pros := [][]byte{} diff --git a/linuxwin/none.go b/linuxwin/none.go index 37c7600..19c6cc9 100644 --- a/linuxwin/none.go +++ b/linuxwin/none.go @@ -11,6 +11,8 @@ import ( signal "github.com/qydysky/part/signal" ) +var EOF = "\n" + func PCheck(pros []string) []int { return []int{} } diff --git a/linuxwin/win.go b/linuxwin/win.go index 804cf67..b4790ac 100755 --- a/linuxwin/win.go +++ b/linuxwin/win.go @@ -14,6 +14,8 @@ import ( signal "github.com/qydysky/part/signal" ) +var EOF = "\r\n" + type ulong int32 type ulong_ptr uintptr diff --git a/log/Log.go b/log/Log.go index 04884eb..dcc3e9f 100644 --- a/log/Log.go +++ b/log/Log.go @@ -14,6 +14,7 @@ import ( f "github.com/qydysky/part/file" m "github.com/qydysky/part/msgq" psql "github.com/qydysky/part/sql" + psys "github.com/qydysky/part/sys" ) var ( @@ -92,7 +93,7 @@ func New(c Config) (o *Log_interface) { } log.New(io.MultiWriter(showObj...), msg.Prefix, - log.Ldate|log.Ltime).Println(append(msg.Base_string, msg.Msgs...)) + log.Ldate|log.Ltime).Printf("%v"+psys.EOL, append(msg.Base_string, msg.Msgs...)) return false }) //启动阻塞 diff --git a/sys/Sys.go b/sys/Sys.go index c4ab86c..9f00083 100644 --- a/sys/Sys.go +++ b/sys/Sys.go @@ -19,6 +19,8 @@ import ( gopsutilLoad "github.com/shirou/gopsutil/load" ) +var EOL = Ppart.EOF + type sys struct { RV []interface{} sync.Mutex -- 2.39.2