From 5d45d1dfd7ac503603730ea07ede8cf04562a349 Mon Sep 17 00:00:00 2001 From: q191201771 <191201771@qq.com> Date: Thu, 30 May 2024 15:19:21 +0800 Subject: [PATCH] =?UTF-8?q?[opt]=20nazalog:=20windows=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E8=A6=81=E6=90=BA=E5=B8=A6=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/nazalog/log.go | 8 +------- pkg/nazalog/log__unix.go | 22 ++++++++++++++++++++++ pkg/nazalog/log__windows.go | 19 +++++++++++++++++++ 3 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 pkg/nazalog/log__unix.go create mode 100644 pkg/nazalog/log__windows.go diff --git a/pkg/nazalog/log.go b/pkg/nazalog/log.go index 57dc516..6121c4d 100644 --- a/pkg/nazalog/log.go +++ b/pkg/nazalog/log.go @@ -214,13 +214,7 @@ func (l *logger) Out(level Level, calldepth int, s string) { writeTime(&l.core.buf, now, l.core.option.TimestampWithMsFlag) } - if l.core.option.LevelFlag { - if l.core.console != nil { - l.core.buf.WriteString(levelToColorString[level]) - } else { - l.core.buf.WriteString(levelToString[level]) - } - } + l.writeLevelStringIfNeeded(level) if l.prefixs != nil { for _, s := range l.prefixs { diff --git a/pkg/nazalog/log__unix.go b/pkg/nazalog/log__unix.go new file mode 100644 index 0000000..e13b259 --- /dev/null +++ b/pkg/nazalog/log__unix.go @@ -0,0 +1,22 @@ +// Copyright 2024, Chef. All rights reserved. +// https://github.com/q191201771/naza +// +// Use of this source code is governed by a MIT-style license +// that can be found in the License file. +// +// Author: Chef (191201771@qq.com) + +//go:build linux || darwin || netbsd || freebsd || openbsd || dragonfly +// +build linux darwin netbsd freebsd openbsd dragonfly + +package nazalog + +func (l *logger) writeLevelStringIfNeeded(level Level) { + if l.core.option.LevelFlag { + if l.core.console != nil { + l.core.buf.WriteString(levelToColorString[level]) + } else { + l.core.buf.WriteString(levelToString[level]) + } + } +} diff --git a/pkg/nazalog/log__windows.go b/pkg/nazalog/log__windows.go new file mode 100644 index 0000000..5a9bdbc --- /dev/null +++ b/pkg/nazalog/log__windows.go @@ -0,0 +1,19 @@ +// Copyright 2024, Chef. All rights reserved. +// https://github.com/q191201771/naza +// +// Use of this source code is governed by a MIT-style license +// that can be found in the License file. +// +// Author: Chef (191201771@qq.com) + +//go:build windows +// +build windows + +package nazalog + +func (l *logger) writeLevelStringIfNeeded(level Level) { + if l.core.option.LevelFlag { + // windows系统不用写带颜色的日志级别字段 + l.core.buf.WriteString(levelToString[level]) + } +}