From 234dacec3eaabf3e99ee6179255378988665199c Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 18 Aug 2025 03:14:57 +0800 Subject: Rename globalData to global --- forged/internal/incoming/web/handler.go | 4 ++-- forged/internal/incoming/web/router.go | 4 ++-- forged/internal/incoming/web/server.go | 8 ++++---- forged/internal/incoming/web/types/types.go | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'forged/internal/incoming/web') diff --git a/forged/internal/incoming/web/handler.go b/forged/internal/incoming/web/handler.go index bc50b33..63019b4 100644 --- a/forged/internal/incoming/web/handler.go +++ b/forged/internal/incoming/web/handler.go @@ -16,8 +16,8 @@ type handler struct { r *Router } -func NewHandler(cfg Config, globalData *global.GlobalData, queries *queries.Queries) *handler { - h := &handler{r: NewRouter().ReverseProxy(cfg.ReverseProxy).Global(globalData).Queries(queries)} +func NewHandler(cfg Config, global *global.Global, queries *queries.Queries) *handler { + h := &handler{r: NewRouter().ReverseProxy(cfg.ReverseProxy).Global(global).Queries(queries)} staticFS := http.FileServer(http.Dir(cfg.StaticPath)) h.r.ANYHTTP("-/static/*rest", diff --git a/forged/internal/incoming/web/router.go b/forged/internal/incoming/web/router.go index 7c2717d..c1a0bc0 100644 --- a/forged/internal/incoming/web/router.go +++ b/forged/internal/incoming/web/router.go @@ -60,14 +60,14 @@ type Router struct { routes []route errors ErrorRenderers user UserResolver - global *global.GlobalData + global *global.Global reverseProxy bool queries *queries.Queries } func NewRouter() *Router { return &Router{} } -func (r *Router) Global(g *global.GlobalData) *Router { +func (r *Router) Global(g *global.Global) *Router { r.global = g return r } diff --git a/forged/internal/incoming/web/server.go b/forged/internal/incoming/web/server.go index f81886f..465657c 100644 --- a/forged/internal/incoming/web/server.go +++ b/forged/internal/incoming/web/server.go @@ -19,12 +19,12 @@ type Server struct { root string httpServer *http.Server shutdownTimeout uint32 - globalData *global.GlobalData + global *global.Global } -func New(config Config, globalData *global.GlobalData, queries *queries.Queries) *Server { +func New(config Config, global *global.Global, queries *queries.Queries) *Server { httpServer := &http.Server{ - Handler: NewHandler(config, globalData, queries), + Handler: NewHandler(config, global, queries), ReadTimeout: time.Duration(config.ReadTimeout) * time.Second, WriteTimeout: time.Duration(config.WriteTimeout) * time.Second, IdleTimeout: time.Duration(config.IdleTimeout) * time.Second, @@ -36,7 +36,7 @@ func New(config Config, globalData *global.GlobalData, queries *queries.Queries) root: config.Root, shutdownTimeout: config.ShutdownTimeout, httpServer: httpServer, - globalData: globalData, + global: global, } } diff --git a/forged/internal/incoming/web/types/types.go b/forged/internal/incoming/web/types/types.go index 1301fe9..bacce24 100644 --- a/forged/internal/incoming/web/types/types.go +++ b/forged/internal/incoming/web/types/types.go @@ -19,7 +19,7 @@ type BaseData struct { SeparatorIndex int RefType string RefName string - Global *global.GlobalData + Global *global.Global Queries *queries.Queries } -- cgit v1.2.3