more refactor

This commit is contained in:
matst80
2025-12-03 09:14:17 +01:00
parent a0142c2698
commit 976d44ed54
4 changed files with 122 additions and 77 deletions

View File

@@ -64,7 +64,7 @@ func (a *CheckoutPoolServer) reserveInventory(ctx context.Context, grain *checko
return nil
}
func CheckoutIdHandler(fn func(checkoutId checkout.CheckoutId, w http.ResponseWriter, r *http.Request) error) func(w http.ResponseWriter, r *http.Request) {
func CheckoutIdHandler(fn func(w http.ResponseWriter, r *http.Request, checkoutId checkout.CheckoutId) error) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
var id checkout.CheckoutId
raw := r.PathValue("id")
@@ -81,7 +81,7 @@ func CheckoutIdHandler(fn func(checkoutId checkout.CheckoutId, w http.ResponseWr
}
}
err := fn(id, w, r)
err := fn(w, r, id)
if err != nil {
log.Printf("Server error, not remote error: %v\n", err)
w.WriteHeader(http.StatusInternalServerError)
@@ -90,8 +90,8 @@ func CheckoutIdHandler(fn func(checkoutId checkout.CheckoutId, w http.ResponseWr
}
}
func (s *CheckoutPoolServer) ProxyHandler(fn func(w http.ResponseWriter, r *http.Request, checkoutId checkout.CheckoutId) error) func(checkoutId checkout.CheckoutId, w http.ResponseWriter, r *http.Request) error {
return func(checkoutId checkout.CheckoutId, w http.ResponseWriter, r *http.Request) error {
func (s *CheckoutPoolServer) ProxyHandler(fn func(w http.ResponseWriter, r *http.Request, checkoutId checkout.CheckoutId) error) func(w http.ResponseWriter, r *http.Request, checkoutId checkout.CheckoutId) error {
return func(w http.ResponseWriter, r *http.Request, checkoutId checkout.CheckoutId) error {
if ownerHost, ok := s.OwnerHost(uint64(checkoutId)); ok {
ctx, span := tracer.Start(r.Context(), "proxy")
defer span.End()