diff --git a/backend/main.go b/backend/main.go index 272cba2..9d67b7d 100644 --- a/backend/main.go +++ b/backend/main.go @@ -5,7 +5,7 @@ import ( "github.com/pocketbase/pocketbase/plugins/migratecmd" _ "htwkalender/migrations" "htwkalender/service" - "log" + "log/slog" "os" "strings" ) @@ -27,6 +27,6 @@ func main() { service.AddSchedules(app) if err := app.Start(); err != nil { - log.Fatal(err) + slog.Error("Failed to start app: %v", err) } } diff --git a/backend/service/feed/feedFunctions.go b/backend/service/feed/feedFunctions.go index 853a144..906e36d 100644 --- a/backend/service/feed/feedFunctions.go +++ b/backend/service/feed/feedFunctions.go @@ -1,17 +1,18 @@ package feed import ( + "database/sql" "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase/daos" database "htwkalender/service/db" localTime "htwkalender/service/functions/time" - "log" + "log/slog" ) func ClearFeeds(db *daos.Dao, months int, clock localTime.Clock) { feeds, err := database.GetAllFeeds(db) if err != nil { - log.Println("CleanFeeds: get all feeds failed") + slog.Error("CleanFeeds: failed to get all feeds", err) return } for _, feed := range feeds { @@ -22,13 +23,13 @@ func ClearFeeds(db *daos.Dao, months int, clock localTime.Clock) { if feedRetrievedTime.Before(timeShift) { // delete feed - sqlResult, err := db.DB().Delete("feeds", dbx.NewExp("id = {:id}", dbx.Params{"id": feed.GetId()})).Execute() + var sqlResult sql.Result + sqlResult, err = db.DB().Delete("feeds", dbx.NewExp("id = {:id}", dbx.Params{"id": feed.GetId()})).Execute() if err != nil { - log.Println("CleanFeeds: delete feed " + feed.GetId() + " failed") - log.Println(err) - log.Println(sqlResult) + slog.Error("CleanFeeds: delete feed "+feed.GetId()+" failed", err) + slog.Error("SQL Result: ", sqlResult) } else { - log.Println("CleanFeeds: delete feed " + feed.GetId() + " successful") + slog.Info("CleanFeeds: delete feed " + feed.GetId() + " successful") } } }