diff --git a/.gitignore b/.gitignore index 2a775a7..97c9753 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ testing/ -.vscode/launch.json \ No newline at end of file +.vscode/launch.json diff --git a/example/example.go b/example/example.go index fa5dc74..f3768ce 100644 --- a/example/example.go +++ b/example/example.go @@ -2,7 +2,7 @@ package example import ( "encoding/json" - "log" + "log/slog" "os" "time" @@ -16,7 +16,7 @@ func main() { HomeZoneEntityId: "zone.home", }) if err != nil { - log.Fatalln("Error connecting to HASS:", err) + slog.Error("Error connecting to HASS:", err) } defer app.Cleanup() @@ -69,7 +69,7 @@ func onEvent(service *ga.Service, state ga.State, data ga.EventData) { // the eventTypes.go file :) ev := ga.EventZWaveJSValueNotification{} json.Unmarshal(data.RawEventJSON, &ev) - log.Default().Println(ev) + slog.Info("On event invoked", "event", ev) } func lightsOut(service *ga.Service, state ga.State) { @@ -77,7 +77,7 @@ func lightsOut(service *ga.Service, state ga.State) { service.Light.TurnOff("light.outside_lights") s, err := state.Get("binary_sensor.living_room_motion") if err != nil { - log.Default().Println("couldnt get living room motion state, doing nothing") + slog.Warn("couldnt get living room motion state, doing nothing") return } diff --git a/example/example_live_test.go b/example/example_live_test.go index 159e44c..e636a22 100644 --- a/example/example_live_test.go +++ b/example/example_live_test.go @@ -48,7 +48,6 @@ func setupLogging() { func (s *MySuite) SetupSuite() { setupLogging() slog.Debug("Setting up test suite...") - s.suiteCtx = make(map[string]any) configFile, err := os.ReadFile("./config.yaml") diff --git a/internal/websocket/reader.go b/internal/websocket/reader.go index 95977cb..6ac4640 100644 --- a/internal/websocket/reader.go +++ b/internal/websocket/reader.go @@ -3,8 +3,7 @@ package websocket import ( "context" "encoding/json" - "fmt" - "log" + "log/slog" "github.com/gorilla/websocket" ) @@ -25,9 +24,8 @@ type ChanMsg struct { func ListenWebsocket(conn *websocket.Conn, ctx context.Context, c chan ChanMsg) { for { bytes, err := ReadMessage(conn, ctx) - if err != nil { - log.Default().Println("Error reading from websocket:", err) + slog.Error("Error reading from websocket:", err) close(c) break } @@ -38,7 +36,7 @@ func ListenWebsocket(conn *websocket.Conn, ctx context.Context, c chan ChanMsg) } json.Unmarshal(bytes, &base) if !base.Success { - fmt.Println("WARNING: received unsuccessful response:", string(bytes)) + slog.Warn("Received unsuccessful response", "response", string(bytes)) } chanMsg := ChanMsg{ Type: base.Type, diff --git a/schedule.go b/schedule.go index a0f11d0..9dad2f0 100644 --- a/schedule.go +++ b/schedule.go @@ -168,7 +168,7 @@ func runSchedules(a *App) { sched = popSchedule(a) } - slog.Info("Next schedule", "new run time", sched.nextRunTime) + slog.Info("Next schedule", "next run time", sched.nextRunTime) time.Sleep(time.Until(sched.nextRunTime)) sched.maybeRunCallback(a) requeueSchedule(a, sched)