From d02f6d2899550aaef0bec2ae7d50ab41de43e44f Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Tue, 27 May 2025 16:40:14 +0100
Subject: [PATCH] knotserver: add logger to internal mux

Signed-off-by: oppiliappan <me@oppi.li>
---
 knotserver/internal.go |  5 ++++-
 knotserver/server.go   | 21 +++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/knotserver/internal.go b/knotserver/internal.go
index 03a1ae15..a24ced3e 100644
--- a/knotserver/internal.go
+++ b/knotserver/internal.go
@@ -2,6 +2,7 @@ package knotserver
 
 import (
 	"context"
+	"log/slog"
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
@@ -13,6 +14,7 @@ import (
 type InternalHandle struct {
 	db *db.DB
 	e  *rbac.Enforcer
+	l  *slog.Logger
 }
 
 func (h *InternalHandle) PushAllowed(w http.ResponseWriter, r *http.Request) {
@@ -50,12 +52,13 @@ func (h *InternalHandle) InternalKeys(w http.ResponseWriter, r *http.Request) {
 	return
 }
 
-func Internal(ctx context.Context, db *db.DB, e *rbac.Enforcer) http.Handler {
+func Internal(ctx context.Context, db *db.DB, e *rbac.Enforcer, l *slog.Logger) http.Handler {
 	r := chi.NewRouter()
 
 	h := InternalHandle{
 		db,
 		e,
+		l,
 	}
 
 	r.Get("/push-allowed", h.PushAllowed)
diff --git a/knotserver/server.go b/knotserver/server.go
index 28674af6..8ebbb9aa 100644
--- a/knotserver/server.go
+++ b/knotserver/server.go
@@ -38,7 +38,8 @@ Environment variables:
 }
 
 func Run(ctx context.Context, cmd *cli.Command) error {
-	l := log.FromContext(ctx)
+	logger := log.FromContext(ctx)
+	iLogger := log.New("knotserver/internal")
 
 	c, err := config.Load(ctx)
 	if err != nil {
@@ -52,10 +53,10 @@ func Run(ctx context.Context, cmd *cli.Command) error {
 	if err != nil {
 		return fmt.Errorf("failed to setup hooks: %w", err)
 	}
-	l.Info("successfully finished setting up hooks")
+	logger.Info("successfully finished setting up hooks")
 
 	if c.Server.Dev {
-		l.Info("running in dev mode, signature verification is disabled")
+		logger.Info("running in dev mode, signature verification is disabled")
 	}
 
 	db, err := db.Setup(c.Server.DBPath)
@@ -73,22 +74,22 @@ func Run(ctx context.Context, cmd *cli.Command) error {
 	jc, err := jetstream.NewJetstreamClient(c.Server.JetstreamEndpoint, "knotserver", []string{
 		tangled.PublicKeyNSID,
 		tangled.KnotMemberNSID,
-	}, nil, l, db, true)
+	}, nil, logger, db, true)
 	if err != nil {
-		l.Error("failed to setup jetstream", "error", err)
+		logger.Error("failed to setup jetstream", "error", err)
 	}
 
-	mux, err := Setup(ctx, c, db, e, jc, l)
+	mux, err := Setup(ctx, c, db, e, jc, logger)
 	if err != nil {
 		return fmt.Errorf("failed to setup server: %w", err)
 	}
-	imux := Internal(ctx, db, e)
+	imux := Internal(ctx, db, e, iLogger)
 
-	l.Info("starting internal server", "address", c.Server.InternalListenAddr)
+	logger.Info("starting internal server", "address", c.Server.InternalListenAddr)
 	go http.ListenAndServe(c.Server.InternalListenAddr, imux)
 
-	l.Info("starting main server", "address", c.Server.ListenAddr)
-	l.Error("server error", "error", http.ListenAndServe(c.Server.ListenAddr, mux))
+	logger.Info("starting main server", "address", c.Server.ListenAddr)
+	logger.Error("server error", "error", http.ListenAndServe(c.Server.ListenAddr, mux))
 
 	return nil
 }
-- 
2.51.2