From 863e56274304115dcfe7925b769afc1a6d12013a Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 26 Sep 2024 02:30:03 -0400 Subject: [PATCH] chore: pass neccessary conf only --- cmd/joj3/main.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/joj3/main.go b/cmd/joj3/main.go index 46f1847..8b05c76 100644 --- a/cmd/joj3/main.go +++ b/cmd/joj3/main.go @@ -13,9 +13,9 @@ import ( "github.com/jinzhu/copier" ) -func setupSlog(conf Conf) { +func setupSlog(logLevel int) { lvl := new(slog.LevelVar) - lvl.Set(slog.Level(conf.LogLevel)) + lvl.Set(slog.Level(logLevel)) opts := &slog.HandlerOptions{Level: lvl} handler := slog.NewTextHandler(os.Stderr, opts) logger := slog.New(handler) @@ -62,12 +62,12 @@ func generateStages(conf Conf) ([]stage.Stage, error) { return stages, nil } -func outputResult(conf Conf, results []stage.StageResult) error { +func outputResult(outputPath string, results []stage.StageResult) error { content, err := json.Marshal(results) if err != nil { return err } - return os.WriteFile(conf.OutputPath, + return os.WriteFile(outputPath, append(content, []byte("\n")...), 0o600) } @@ -84,7 +84,7 @@ func mainImpl() error { slog.Error("no conf found", "error", err) return err } - setupSlog(conf) + setupSlog(conf.LogLevel) executors.InitWithConf(conf.SandboxExecServer, conf.SandboxToken) stages, err := generateStages(conf) if err != nil { @@ -97,7 +97,7 @@ func mainImpl() error { slog.Error("run stages", "error", err) return err } - if err := outputResult(conf, results); err != nil { + if err := outputResult(conf.OutputPath, results); err != nil { slog.Error("output result", "error", err) return err }