From 178a73ae4f8d7008ddb1416698159377553e7551 Mon Sep 17 00:00:00 2001 From: shy Date: Mon, 1 Jul 2024 20:42:27 +0800 Subject: [PATCH] add some --- base/tcp/host.go | 6 ++---- logs.go | 11 ++++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/base/tcp/host.go b/base/tcp/host.go index 5ee51f2b..48a977cd 100644 --- a/base/tcp/host.go +++ b/base/tcp/host.go @@ -67,10 +67,8 @@ func init() { )), ), Actions: ice.MergeActions(ice.Actions{ ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { - m.Cmd("", func(value ice.Maps) { - ice.Info.Host = value[aaa.IP] - m.Cmd("", aaa.WHITE, LOCALHOST, value[aaa.IP]) - }) + m.Cmd("", func(value ice.Maps) { m.Cmd("", aaa.WHITE, LOCALHOST, value[aaa.IP]) }) + ice.Info.Host = mdb.Config(m, DOMAIN) }}, mdb.SEARCH: {Hand: func(m *ice.Message, arg ...string) { if mdb.IsSearchPreview(m, arg) && m.Cmd(HOST).Length() > 0 { diff --git a/logs.go b/logs.go index 49db19ba..bbdd9eb6 100644 --- a/logs.go +++ b/logs.go @@ -7,7 +7,6 @@ import ( "fmt" "io" "net/http" - "os" "runtime" "strings" "time" @@ -53,9 +52,12 @@ func (m *Message) join(arg ...Any) (string, []Any) { return kit.Join(list, SP), meta } func (m *Message) log(level string, str string, arg ...Any) *Message { - if m.Option(LOG_DISABLE) == TRUE { + if !strings.Contains(Info.Make.Domain, "debug=true") { return m } + if m.Option(LOG_DISABLE) == TRUE { + // return m + } args, traceid := []Any{}, "" for _, v := range arg { if v, ok := v.(logs.Meta); ok && v.Key == logs.TRACEID { @@ -66,11 +68,6 @@ func (m *Message) log(level string, str string, arg ...Any) *Message { } _source := logs.FileLineMeta(3) kit.If(Info.Log != nil, func() { Info.Log(m, m.FormatPrefix(traceid), level, logs.Format(str, append(args, _source)...)) }) - if os.Getenv("TERM") == "" { - if !strings.Contains(Info.Make.Domain, "debug=true") { - return m - } - } prefix, suffix := "", "" if Info.Colors { switch level {