forked from tangled.org/core
Monorepo for Tangled — https://tangled.org

knotserver: pass config to internal mux

Signed-off-by: oppiliappan <me@oppi.li>

oppi.li 4f3f8982 203b0a97

verified
Changed files
+5 -2
knotserver
+4 -1
knotserver/internal.go
··· 7 8 "github.com/go-chi/chi/v5" 9 "github.com/go-chi/chi/v5/middleware" 10 "tangled.sh/tangled.sh/core/knotserver/db" 11 "tangled.sh/tangled.sh/core/rbac" 12 ) 13 14 type InternalHandle struct { 15 db *db.DB 16 e *rbac.Enforcer 17 l *slog.Logger 18 } ··· 52 return 53 } 54 55 - func Internal(ctx context.Context, db *db.DB, e *rbac.Enforcer, l *slog.Logger) http.Handler { 56 r := chi.NewRouter() 57 58 h := InternalHandle{ 59 db, 60 e, 61 l, 62 }
··· 7 8 "github.com/go-chi/chi/v5" 9 "github.com/go-chi/chi/v5/middleware" 10 + "tangled.sh/tangled.sh/core/knotserver/config" 11 "tangled.sh/tangled.sh/core/knotserver/db" 12 "tangled.sh/tangled.sh/core/rbac" 13 ) 14 15 type InternalHandle struct { 16 db *db.DB 17 + c *config.Config 18 e *rbac.Enforcer 19 l *slog.Logger 20 } ··· 54 return 55 } 56 57 + func Internal(ctx context.Context, c *config.Config, db *db.DB, e *rbac.Enforcer, l *slog.Logger) http.Handler { 58 r := chi.NewRouter() 59 60 h := InternalHandle{ 61 db, 62 + c, 63 e, 64 l, 65 }
+1 -1
knotserver/server.go
··· 83 if err != nil { 84 return fmt.Errorf("failed to setup server: %w", err) 85 } 86 - imux := Internal(ctx, db, e, iLogger) 87 88 logger.Info("starting internal server", "address", c.Server.InternalListenAddr) 89 go http.ListenAndServe(c.Server.InternalListenAddr, imux)
··· 83 if err != nil { 84 return fmt.Errorf("failed to setup server: %w", err) 85 } 86 + imux := Internal(ctx, c, db, e, iLogger) 87 88 logger.Info("starting internal server", "address", c.Server.InternalListenAddr) 89 go http.ListenAndServe(c.Server.InternalListenAddr, imux)