Skip to content

Commit 7778afe

Browse files
Use slog library insted of manual printf
1 parent 163a53c commit 7778afe

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

configurator/configurator.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,12 @@ func (c *RealConfigurator) getConfigFileFromUserConfigDir() (model.Config, strin
5858
d := toml.NewDecoder(reader)
5959
d.DisallowUnknownFields()
6060
err = d.Decode(&config)
61-
var details *toml.StrictMissingError
6261
if err != nil {
63-
if !errors.As(err, &details) {
64-
fmt.Printf("err: %v\n", err)
62+
var details *toml.StrictMissingError
63+
if errors.As(err, &details) {
64+
return config, details.String(), err
6565
}
66-
fmt.Println(details.String())
67-
}
68-
if details != nil {
69-
return config, details.String(), err
66+
return config, "", err
7067
}
7168
} else {
7269
err = toml.Unmarshal(file, &config)

seshcli/seshcli.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package seshcli
22

33
import (
4-
"fmt"
54
"log/slog"
65

76
"github.com/urfave/cli/v2"
@@ -49,12 +48,11 @@ func App(version string) cli.App {
4948
tmuxinator := tmuxinator.NewTmuxinator(shell)
5049

5150
// config
52-
config, err, details := configurator.NewConfigurator(os, path, runtime).GetConfig()
51+
config, details, err := configurator.NewConfigurator(os, path, runtime).GetConfig()
5352
// TODO: make sure to ignore the error if the config doesn't exist
54-
if err != "" {
55-
if details != nil {
56-
fmt.Println(details)
57-
panic(details.Error())
53+
if err != nil {
54+
if details != "" {
55+
slog.Error("seshcli/seshcli.go: App", "version", version, "error", details)
5856
}
5957
slog.Error("seshcli/seshcli.go: App", "error", err)
6058
panic(err)

0 commit comments

Comments
 (0)