fix: refine logging

This commit is contained in:
2024-12-04 21:49:44 +01:00
parent 5198487feb
commit 521119fc02
14 changed files with 93 additions and 70 deletions

17
main.go
View File

@@ -3,6 +3,7 @@ package main
import (
"me-fit/db"
"me-fit/handler"
"me-fit/log"
"me-fit/middleware"
"me-fit/service"
"me-fit/types"
@@ -10,8 +11,6 @@ import (
"context"
"database/sql"
"log"
"log/slog"
"net/http"
"os"
"os/signal"
@@ -32,7 +31,7 @@ func main() {
db, err := sql.Open("sqlite3", "./data.db")
if err != nil {
log.Fatal("Could not open Database data.db: ", err)
log.Fatal("Could not open Database data.db: %v", err)
}
defer db.Close()
@@ -43,7 +42,7 @@ func run(ctx context.Context, db *sql.DB, env func(string) string) {
ctx, cancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
defer cancel()
slog.Info("Starting server...")
log.Info("Starting server...")
// init server settings
serverSettings := types.NewServerSettingsFromEnv(env)
@@ -51,7 +50,7 @@ func run(ctx context.Context, db *sql.DB, env func(string) string) {
// init db
err := utils.RunMigrations(db, "")
if err != nil {
slog.Error("Could not run migrations: " + err.Error())
log.Error("Could not run migrations: %v", err)
os.Exit(1)
}
@@ -80,9 +79,9 @@ func run(ctx context.Context, db *sql.DB, env func(string) string) {
}
func startServer(s *http.Server) {
slog.Info("Starting server on " + s.Addr)
log.Info("Starting server on %v", s.Addr)
if err := s.ListenAndServe(); err != nil && err != http.ErrServerClosed {
slog.Error("error listening and serving: " + err.Error())
log.Error("error listening and serving: %v", err)
}
}
@@ -97,9 +96,9 @@ func shutdownServer(s *http.Server, ctx context.Context, wg *sync.WaitGroup) {
shutdownCtx, cancel := context.WithTimeout(shutdownCtx, 10*time.Second)
defer cancel()
if err := s.Shutdown(shutdownCtx); err != nil {
slog.Error("error shutting down http server: " + err.Error())
log.Error("error shutting down http server: %v", err)
} else {
slog.Info("Gracefully stopped http server on " + s.Addr)
log.Info("Gracefully stopped http server on %v", s.Addr)
}
}