installed logger

This commit is contained in:
2026-01-11 16:54:50 -07:00
parent eed88b0764
commit 9de51c3925
12 changed files with 116 additions and 42 deletions
+36 -24
View File
@@ -13,10 +13,12 @@ import (
"net/http"
"os"
"os/signal"
"strings"
"syscall"
"time"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/lmittmann/tint"
"ruben/inventory2/internal/domains/accounts"
"ruben/inventory2/internal/domains/authentication"
@@ -31,27 +33,36 @@ const (
)
func main() {
if err := runApp(context.Background()); err != nil {
panic(err)
}
fmt.Println("application shutdown")
}
func runApp(ctx context.Context) error {
ctx, shutdown := context.WithCancel(ctx)
defer shutdown()
logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
logger := slog.New(tint.NewHandler(os.Stderr, &tint.Options{
AddSource: true,
Level: slog.LevelDebug,
ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
fmt.Println("slog groups:", groups)
fmt.Println("slog attr:", a)
// TODO: not sure if this will be needed, but keep around until known.
// this can perform general key=value log cleanup
if a.Key == slog.SourceKey && len(groups) == 0 {
source := a.Value.Any().(*slog.Source)
source.File = strings.TrimPrefix(source.File, "/home/angel/go/src/ruben/inventory2/internal")
}
return a
},
// Time format (Default: time.StampMilli)
//TimeFormat: "",
}))
logger.Info("application starting")
if err := runApp(context.Background(), logger); err != nil {
panic(err)
}
logger.Info("application shutdown")
}
func runApp(ctx context.Context, logger *slog.Logger) error {
ctx, shutdown := context.WithCancel(ctx)
defer shutdown()
// connect to the database
connPool, err := newPool(ctx)
@@ -61,7 +72,7 @@ func runApp(ctx context.Context) error {
// start background processes
auth, err := authentication.New(ctx, connPool, logger.WithGroup("*authentication.Authenticator"))
auth, err := authentication.New(ctx, connPool, logger.WithGroup("authenticator"))
if err != nil {
return fmt.Errorf("failed to construct authenticator: %w", err)
}
@@ -85,19 +96,19 @@ func runApp(ctx context.Context) error {
)
select {
case s := <-osSignalCh:
fmt.Println("application received shutdown signal:", s)
fmt.Println("shutting down")
logger.Info("application received shutdown signal", "signal", s)
logger.Info("shutting down")
case err := <-authErrCh:
alreadyShutdown.authProcesses = true
fmt.Println("auth processes shutdown unexpectedly")
logger.Error("auth processes shutdown unexpectedly")
if err != nil {
fmt.Println("auth processes encountered error:", err)
logger.Error("auth processes encountered error", "error", err)
}
case err := <-srvErrCh:
alreadyShutdown.server = true
fmt.Println("server shutdown unexpectedly")
logger.Error("server shutdown unexpectedly")
if err != nil {
fmt.Println("server encountered error:", err)
logger.Error("server encountered error", "error", err)
}
}
@@ -111,14 +122,14 @@ func runApp(ctx context.Context) error {
if err := <-authErrCh; err != nil {
errs = append(errs, fmt.Errorf("auth processes experienced an error: %w", err))
}
fmt.Println("auth processes shut down")
logger.Info("auth processes shut down")
}
if !alreadyShutdown.server {
if err := <-srvErrCh; err != nil {
errs = append(errs, fmt.Errorf("server experienced an error: %w", err))
}
fmt.Println("server shut down")
logger.Info("server shut down")
}
return errors.Join(errs...)
@@ -141,6 +152,7 @@ func runServer(ctx context.Context, logger *slog.Logger, connPool *pgxpool.Pool,
srv := &http.Server{
Addr: ":8082", // local
Handler: server.NewServer(
ctx,
logger.WithGroup("server"),
"./",
raw_events.NewStore(logger.WithGroup("raw-event-store"), connPool),
@@ -167,7 +179,7 @@ func runServer(ctx context.Context, logger *slog.Logger, connPool *pgxpool.Pool,
defer cancel()
defer close(alreadyShutdownCh)
fmt.Println("server running on 8082...")
logger.Info("server running on 8082...")
if err := srv.ListenAndServe(); err != nil {
if !errors.Is(err, http.ErrServerClosed) {
runningErrCh <- fmt.Errorf("server experienced error: %w", err)