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
···
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
"tangled.sh/tangled.sh/core/knotserver/db"
"tangled.sh/tangled.sh/core/rbac"
)
type InternalHandle struct {
db *db.DB
e *rbac.Enforcer
l *slog.Logger
}
···
return
}
-
func Internal(ctx context.Context, db *db.DB, e *rbac.Enforcer, l *slog.Logger) http.Handler {
r := chi.NewRouter()
h := InternalHandle{
db,
e,
l,
}
···
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
+
"tangled.sh/tangled.sh/core/knotserver/config"
"tangled.sh/tangled.sh/core/knotserver/db"
"tangled.sh/tangled.sh/core/rbac"
)
type InternalHandle struct {
db *db.DB
+
c *config.Config
e *rbac.Enforcer
l *slog.Logger
}
···
return
}
+
func Internal(ctx context.Context, c *config.Config, db *db.DB, e *rbac.Enforcer, l *slog.Logger) http.Handler {
r := chi.NewRouter()
h := InternalHandle{
db,
+
c,
e,
l,
}
+1 -1
knotserver/server.go
···
if err != nil {
return fmt.Errorf("failed to setup server: %w", err)
}
-
imux := Internal(ctx, db, e, iLogger)
logger.Info("starting internal server", "address", c.Server.InternalListenAddr)
go http.ListenAndServe(c.Server.InternalListenAddr, imux)
···
if err != nil {
return fmt.Errorf("failed to setup server: %w", err)
}
+
imux := Internal(ctx, c, db, e, iLogger)
logger.Info("starting internal server", "address", c.Server.InternalListenAddr)
go http.ListenAndServe(c.Server.InternalListenAddr, imux)