From 03b9a3d7dc2f365ca3f58e4a97fe1ab5787ca40a Mon Sep 17 00:00:00 2001 From: peefy Date: Mon, 27 Nov 2023 10:23:21 +0800 Subject: [PATCH] feat: support logger opts to mergs Signed-off-by: peefy --- pkg/kcl/api.go | 5 ++++- pkg/kcl/opt.go | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkg/kcl/api.go b/pkg/kcl/api.go index a93119f1..e09edcff 100644 --- a/pkg/kcl/api.go +++ b/pkg/kcl/api.go @@ -227,7 +227,10 @@ func run(pathList []string, opts ...Option) (*KCLResultList, error) { // Output log message logger := args.GetLogger() if logger != nil && resp.LogMessage != "" { - logger.Info(resp.LogMessage) + _, err := logger.Write([]byte(resp.LogMessage)) + if err != nil { + return nil, err + } } if resp.ErrMessage != "" { return nil, errors.New(resp.ErrMessage) diff --git a/pkg/kcl/opt.go b/pkg/kcl/opt.go index 57846c7a..7fa1acff 100644 --- a/pkg/kcl/opt.go +++ b/pkg/kcl/opt.go @@ -5,11 +5,11 @@ package kcl import ( "encoding/json" "fmt" + "io" "os" "path/filepath" "strings" - "kcl-lang.io/kcl-go/pkg/logger" "kcl-lang.io/kcl-go/pkg/settings" "kcl-lang.io/kcl-go/pkg/spec/gpyrpc" "kcl-lang.io/kcl-go/pkg/tools/override" @@ -17,7 +17,7 @@ import ( type Option struct { *gpyrpc.ExecProgram_Args - logger logger.Logger + logger io.Writer Err error } @@ -36,7 +36,7 @@ func (p *Option) JSONString() string { return string(x) } -func (p *Option) GetLogger() logger.Logger { +func (p *Option) GetLogger() io.Writer { return p.logger } @@ -79,7 +79,7 @@ func ParseArgs(pathList []string, opts ...Option) (Option, error) { return *args, nil } -func WithLogger(l logger.Logger) Option { +func WithLogger(l io.Writer) Option { var opt = NewOption() opt.logger = l return *opt @@ -279,6 +279,7 @@ func (p *Option) Merge(opts ...Option) *Option { if opt.ExternalPkgs != nil { p.ExternalPkgs = append(p.ExternalPkgs, opt.ExternalPkgs...) } + p.logger = opt.logger } return p }