Skip to content

Commit cd146ea

Browse files
committed
Debug linting
1 parent 2a3f03f commit cd146ea

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

parrotserver/config_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ func TestConfig(t *testing.T) {
1111
t.Setenv("LOG_LEVEL", "butterfly")
1212

1313
config := readConfig()
14-
assert.Equal(t, config.SaveFile, "kendrick.json")
15-
assert.Equal(t, config.LogLevel, "butterfly")
14+
assert.Equal(t, "kendrick.json", config.SaveFile)
15+
assert.Equal(t, "butterfly", config.LogLevel)
1616
}
1717

1818
func TestConfigDefaults(t *testing.T) {
1919
config := readConfig()
20-
assert.Equal(t, config.SaveFile, "save.json")
21-
assert.Equal(t, config.LogLevel, "debug")
20+
assert.Equal(t, "save.json", config.SaveFile)
21+
assert.Equal(t, "debug", config.LogLevel)
2222
}

parrotserver/main.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func init() {
3131
log.Logger = log.Logger.Level(level).With().Timestamp().Logger()
3232
}
3333

34-
func main() {
34+
func start() int {
3535
defer func() {
3636
if err := save(); err != nil {
3737
log.Error().Err(err).Msg("Failed to save configuration")
@@ -49,8 +49,14 @@ func main() {
4949
IdleTimeout: 15 * time.Second,
5050
}
5151

52-
log.Info().Int("Port", 8080).Interface("Config", config).Msg("Mock server started")
52+
log.Info().Int("port", 8080).Interface("config", config).Msg("Parrot server started")
5353
if err := server.ListenAndServe(); err != nil {
54-
log.Fatal().Err(err).Msg("Server stopped")
54+
log.Error().Err(err).Msg("Server stopped")
55+
return 1
5556
}
57+
return 0
58+
}
59+
60+
func main() {
61+
os.Exit(start())
5662
}

0 commit comments

Comments
 (0)