internal logging library

This commit is contained in:
2026-01-12 23:21:52 -07:00
parent ee2808f8a1
commit 851234d9fa
18 changed files with 349 additions and 159 deletions
+3 -3
View File
@@ -3,10 +3,10 @@ package accounts
import (
"errors"
"fmt"
"log/slog"
"net/http"
"ruben/inventory2/internal/consts"
"ruben/inventory2/internal/domains/accounts"
"ruben/inventory2/internal/logging"
"ruben/inventory2/internal/server/middleware"
"ruben/inventory2/internal/server/response"
"ruben/inventory2/internal/server/router"
@@ -14,13 +14,13 @@ import (
)
type accountSubrouter struct {
log *slog.Logger
log *logging.Logger
*router.SubMux
accts *accounts.Store
}
func NewAccountSubrouter(
logger *slog.Logger,
logger *logging.Logger,
accts *accounts.Store,
authMiddleware *middleware.Auth,
) *accountSubrouter {
+4 -4
View File
@@ -3,21 +3,21 @@ package auth
import (
"context"
"fmt"
"log/slog"
"net/http"
"ruben/inventory2/internal/domains/authentication"
"ruben/inventory2/internal/logging"
"ruben/inventory2/internal/server/cookies"
"ruben/inventory2/internal/server/response"
"ruben/inventory2/internal/server/router"
)
type loginSubrouter struct {
log *slog.Logger
log *logging.Logger
auth *authentication.Authenticator
router.Subrouter
}
func NewLoginSubrouter(logger *slog.Logger, auth *authentication.Authenticator) *loginSubrouter {
func NewLoginSubrouter(logger *logging.Logger, auth *authentication.Authenticator) *loginSubrouter {
mux := router.NewSubMux(logger)
ls := &loginSubrouter{
@@ -33,7 +33,7 @@ func NewLoginSubrouter(logger *slog.Logger, auth *authentication.Authenticator)
return ls
}
func (s *loginSubrouter) newLoginSubrouter(logger *slog.Logger) router.Subrouter {
func (s *loginSubrouter) newLoginSubrouter(logger *logging.Logger) router.Subrouter {
mux := router.NewSubMux(logger)
ls := &loginSubrouter{
+3 -6
View File
@@ -3,7 +3,6 @@ package templates
import (
"errors"
"fmt"
"log/slog"
"net/http"
"net/url"
"os"
@@ -15,6 +14,7 @@ import (
"ruben/inventory2/internal/domains/accounts"
etsy_platform "ruben/inventory2/internal/domains/platforms/etsy"
"ruben/inventory2/internal/domains/raw_events"
"ruben/inventory2/internal/logging"
"ruben/inventory2/internal/server/middleware"
"ruben/inventory2/internal/server/response"
"ruben/inventory2/internal/server/router"
@@ -23,7 +23,7 @@ import (
)
type webpageRouter struct {
log *slog.Logger
log *logging.Logger
contentDir string
templater *templater.Templater
rawEvents *raw_events.Store
@@ -33,7 +33,7 @@ type webpageRouter struct {
}
func NewWebpageRouter(
logger *slog.Logger,
logger *logging.Logger,
contentDir string,
tmpl *templater.Templater,
rawEvents *raw_events.Store,
@@ -66,8 +66,6 @@ func NewWebpageRouter(
// compiles the page template or component template matching the url
// func (s *Server) serveTemplates(r *http.Request) (response.Response, error) {
func (s *webpageRouter) serveTemplates(r *http.Request) (response.Response, error) {
fmt.Println("webpageRouter.serveTemplates:", r.URL)
name, args := s.getTemplateNameAndArgs(r, s.contentDir+"/templates/component_bodies")
b, err := s.templater.ExecuteComponentBody(name, args...)
@@ -90,7 +88,6 @@ func (s *webpageRouter) serveTemplates(r *http.Request) (response.Response, erro
// func (s *Server) getTemplateNameAndArgs(r *http.Request, templateDir string) (name string, args []any) {
func (s *webpageRouter) getTemplateNameAndArgs(r *http.Request, templateDir string) (name string, args []any) {
fmt.Println("webpageRouter.getTemplateNameAndArgs:", r.URL)
ctx := r.Context()
name, pathParams := getTemplateNameForURL(r.URL, templateDir)
@@ -3,18 +3,18 @@ package etsy
import (
"encoding/json"
"fmt"
"log/slog"
"net/http"
"strconv"
"time"
"ruben/inventory2/internal/domains/platforms/etsy"
"ruben/inventory2/internal/domains/raw_events"
"ruben/inventory2/internal/logging"
)
type (
Webhooks struct {
log *slog.Logger
log *logging.Logger
cfg Config
db *raw_events.Store
etsy *etsy.Platform
@@ -26,7 +26,7 @@ type (
)
func NewWebhookHandler(
logger *slog.Logger,
logger *logging.Logger,
db *raw_events.Store,
platform *etsy.Platform,
cfg Config,
@@ -3,14 +3,14 @@ package tiktok
import (
"encoding/json"
"fmt"
"log/slog"
"net/http"
"time"
"ruben/inventory2/internal/domains/raw_events"
"ruben/inventory2/internal/logging"
)
func NewWebhookHandler(logger *slog.Logger, db *raw_events.Store) http.Handler {
func NewWebhookHandler(logger *logging.Logger, db *raw_events.Store) http.Handler {
mux := http.NewServeMux()
mux.HandleFunc("POST /test", func(w http.ResponseWriter, r *http.Request) {
+2 -2
View File
@@ -1,11 +1,11 @@
package webhooks
import (
"log/slog"
"net/http"
etsy_platform "ruben/inventory2/internal/domains/platforms/etsy"
"ruben/inventory2/internal/domains/raw_events"
"ruben/inventory2/internal/logging"
"ruben/inventory2/internal/server/api/webhooks/etsy"
"ruben/inventory2/internal/server/api/webhooks/tiktok"
"ruben/inventory2/internal/server/api/webhooks/wix"
@@ -16,7 +16,7 @@ type Config struct {
}
// TODO: just move over to the 'site' package, and then consider renaming the site package to something else?
func New(logger *slog.Logger, eventsDB *raw_events.Store, etsyPlatform *etsy_platform.Platform, cfg Config) http.Handler {
func New(logger *logging.Logger, eventsDB *raw_events.Store, etsyPlatform *etsy_platform.Platform, cfg Config) http.Handler {
wh := http.NewServeMux()
wh.Handle(
+2 -2
View File
@@ -3,14 +3,14 @@ package wix
import (
"encoding/json"
"fmt"
"log/slog"
"net/http"
"time"
"ruben/inventory2/internal/domains/raw_events"
"ruben/inventory2/internal/logging"
)
func NewWebhookHandler(logger *slog.Logger, db *raw_events.Store) http.Handler {
func NewWebhookHandler(logger *logging.Logger, db *raw_events.Store) http.Handler {
mux := http.NewServeMux()
mux.HandleFunc("POST /test", func(w http.ResponseWriter, r *http.Request) {