infra: add logging wrapping
Resolves issues with gcp cloud logging quirks such as field names
This commit is contained in:
@@ -5,9 +5,10 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
|
||||
"github.com/flowy-live/llink/internal/utils/flog"
|
||||
|
||||
"github.com/flowy-live/llink/internal/billing"
|
||||
"github.com/flowy-live/llink/internal/middleware"
|
||||
"github.com/flowy-live/llink/internal/network"
|
||||
@@ -42,7 +43,7 @@ func (h *Handler) GetNetworkUsage(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
isMember, err := h.networkSvc.IsMember(r.Context(), networkID, humanId)
|
||||
if err != nil {
|
||||
slog.Error("failed to check network membership", "error", err, "network_id", networkID)
|
||||
flog.Error("failed to check network membership", "error", err, "network_id", networkID)
|
||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
@@ -53,7 +54,7 @@ func (h *Handler) GetNetworkUsage(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
usage, err := h.billingSvc.GetUsage(r.Context(), networkID)
|
||||
if err != nil {
|
||||
slog.Error("failed to get network usage", "error", err, "network_id", networkID)
|
||||
flog.Error("failed to get network usage", "error", err, "network_id", networkID)
|
||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
@@ -69,7 +70,7 @@ func (h *Handler) GetNetworkBilling(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
status, err := h.billingSvc.GetStatus(r.Context(), net.ID)
|
||||
if err != nil {
|
||||
slog.Error("failed to get billing status", "error", err, "network_id", net.ID)
|
||||
flog.Error("failed to get billing status", "error", err, "network_id", net.ID)
|
||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
@@ -97,14 +98,14 @@ func (h *Handler) CreateCheckoutSession(w http.ResponseWriter, r *http.Request)
|
||||
|
||||
adminHuman, err := h.humanSvc.GetByID(r.Context(), adminHumanId)
|
||||
if err != nil {
|
||||
slog.Error("failed to load admin human", "error", err, "human_id", adminHumanId)
|
||||
flog.Error("failed to load admin human", "error", err, "human_id", adminHumanId)
|
||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
seats, err := h.networkSvc.CountSeats(r.Context(), net.ID)
|
||||
if err != nil {
|
||||
slog.Error("failed to count seats", "error", err, "network_id", net.ID)
|
||||
flog.Error("failed to count seats", "error", err, "network_id", net.ID)
|
||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
@@ -117,7 +118,7 @@ func (h *Handler) CreateCheckoutSession(w http.ResponseWriter, r *http.Request)
|
||||
Seats: seats,
|
||||
})
|
||||
if err != nil {
|
||||
slog.Error("failed to create checkout session", "error", err, "network_id", net.ID)
|
||||
flog.Error("failed to create checkout session", "error", err, "network_id", net.ID)
|
||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
@@ -137,7 +138,7 @@ func (h *Handler) CreatePortalSession(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
slog.Error("failed to create portal session", "error", err, "network_id", net.ID)
|
||||
flog.Error("failed to create portal session", "error", err, "network_id", net.ID)
|
||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
@@ -150,14 +151,14 @@ const maxStripeWebhookBytes = 1 << 20 // 1 MiB
|
||||
func (h *Handler) HandleStripeWebhook(w http.ResponseWriter, r *http.Request) {
|
||||
payload, err := io.ReadAll(io.LimitReader(r.Body, maxStripeWebhookBytes))
|
||||
if err != nil {
|
||||
slog.Warn("stripe webhook: failed to read body", "error", err)
|
||||
flog.Warn("stripe webhook: failed to read body", "error", err)
|
||||
http.Error(w, "bad request", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
signature := r.Header.Get("Stripe-Signature")
|
||||
|
||||
if err := h.billingSvc.HandleWebhook(r.Context(), payload, signature); err != nil {
|
||||
slog.Error("stripe webhook failed", "error", err)
|
||||
flog.Error("stripe webhook failed", "error", err)
|
||||
formattedErr := fmt.Errorf("webhook processing failed: %w", err)
|
||||
http.Error(w, formattedErr.Error(), http.StatusBadRequest)
|
||||
return
|
||||
@@ -187,7 +188,7 @@ func (h *Handler) loadNetworkForAdmin(w http.ResponseWriter, r *http.Request) (*
|
||||
return nil, "", false
|
||||
}
|
||||
if err != nil {
|
||||
slog.Error("failed to load network", "error", err, "network_id", networkID)
|
||||
flog.Error("failed to load network", "error", err, "network_id", networkID)
|
||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
||||
return nil, "", false
|
||||
}
|
||||
@@ -203,6 +204,6 @@ func (h *Handler) loadNetworkForAdmin(w http.ResponseWriter, r *http.Request) (*
|
||||
func writeJSON(w http.ResponseWriter, body any) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
if err := json.NewEncoder(w).Encode(body); err != nil {
|
||||
slog.Error("failed to write json", "error", err)
|
||||
flog.Error("failed to write json", "error", err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user