JOJ/JOJ3
24
5
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

chore: pass neccessary conf only

Browse Source
This commit is contained in:
张泊明518370910136 2024-09-26 02:30:03 -04:00
parent 4b4c83a609
commit 863e562743
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/joj3/main.go
View File

@ -13,9 +13,9 @@ import (
"github.com/jinzhu/copier" "github.com/jinzhu/copier"
) )
func setupSlog(conf Conf) { func setupSlog(logLevel int) {
lvl := new(slog.LevelVar) lvl := new(slog.LevelVar)
lvl.Set(slog.Level(conf.LogLevel)) lvl.Set(slog.Level(logLevel))
opts := &slog.HandlerOptions{Level: lvl} opts := &slog.HandlerOptions{Level: lvl}
handler := slog.NewTextHandler(os.Stderr, opts) handler := slog.NewTextHandler(os.Stderr, opts)
logger := slog.New(handler) logger := slog.New(handler)
@ -62,12 +62,12 @@ func generateStages(conf Conf) ([]stage.Stage, error) {
return stages, nil return stages, nil
} }
func outputResult(conf Conf, results []stage.StageResult) error { func outputResult(outputPath string, results []stage.StageResult) error {
content, err := json.Marshal(results) content, err := json.Marshal(results)
if err != nil { if err != nil {
return err return err
} }
return os.WriteFile(conf.OutputPath, return os.WriteFile(outputPath,
append(content, []byte("\n")...), 0o600) append(content, []byte("\n")...), 0o600)
} }
@ -84,7 +84,7 @@ func mainImpl() error {
slog.Error("no conf found", "error", err) slog.Error("no conf found", "error", err)
return err return err
} }
setupSlog(conf) setupSlog(conf.LogLevel)
executors.InitWithConf(conf.SandboxExecServer, conf.SandboxToken) executors.InitWithConf(conf.SandboxExecServer, conf.SandboxToken)
stages, err := generateStages(conf) stages, err := generateStages(conf)
if err != nil { if err != nil {
@ -97,7 +97,7 @@ func mainImpl() error {
slog.Error("run stages", "error", err) slog.Error("run stages", "error", err)
return err return err
} }
if err := outputResult(conf, results); err != nil { if err := outputResult(conf.OutputPath, results); err != nil {
slog.Error("output result", "error", err) slog.Error("output result", "error", err)
return err return err
} }