refactor: switch to zerolog logger

3 files changed, 9 insertions, 9 deletions

diff --git a/pkg/authz/casbin.go b/pkg/authz/casbin.go
index 99dcc8ec..140bdb98 100644
--- a/pkg/authz/casbin.go
+++ b/pkg/authz/casbin.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 
 	"github.com/casbin/casbin/v3"
+	"github.com/xlgmokha/x/pkg/log"
 	"github.com/xlgmokha/x/pkg/x"
-	xlog "gitlab.com/mokhax/spike/pkg/log"
 )
 
 func WithCasbin() Authorizer {
@@ -16,7 +16,7 @@ func WithCasbin() Authorizer {
 	return AuthorizerFunc(func(r *http.Request) bool {
 		host, _, err := net.SplitHostPort(r.Host)
 		if err != nil {
-			xlog.WithFields(r, xlog.Fields{"error": err})
+			log.WithFields(r.Context(), log.Fields{"error": err})
 			return false
 		}
 
@@ -26,13 +26,13 @@ func WithCasbin() Authorizer {
 		}
 		ok, err := enforcer.Enforce(subject, host, r.Method, r.URL.Path)
 		if err != nil {
-			xlog.WithFields(r, xlog.Fields{"error": err})
+			log.WithFields(r.Context(), log.Fields{"error": err})
 			return false
 		}
 
 		fmt.Printf("%v: %v -> %v %v%v\n", ok, subject, r.Method, host, r.URL.Path)
-		xlog.WithFields(r, xlog.Fields{
-			"ok":      ok,
+		log.WithFields(r.Context(), log.Fields{
+			"authz":   ok,
 			"subject": subject,
 			"action":  r.Method,
 			"domain":  host,
diff --git a/pkg/authz/cedar.go b/pkg/authz/cedar.go
index 9c20a3f4..18674c74 100644
--- a/pkg/authz/cedar.go
+++ b/pkg/authz/cedar.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	cedar "github.com/cedar-policy/cedar-go"
+	"github.com/xlgmokha/x/pkg/log"
 	"gitlab.com/mokhax/spike/pkg/gid"
-	xlog "gitlab.com/mokhax/spike/pkg/log"
 	"gitlab.com/mokhax/spike/pkg/policies"
 )
 
@@ -14,7 +14,7 @@ func WithCedar() Authorizer {
 	return AuthorizerFunc(func(r *http.Request) bool {
 		host, _, err := net.SplitHostPort(r.Host)
 		if err != nil {
-			xlog.WithFields(r, xlog.Fields{"error": err})
+			log.WithFields(r.Context(), log.Fields{"error": err})
 			return false
 		}
 		subject, found := TokenFrom(r).Subject()
diff --git a/pkg/authz/token.go b/pkg/authz/token.go
index 5985a0fc..2794bf4a 100644
--- a/pkg/authz/token.go
+++ b/pkg/authz/token.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/lestrrat-go/jwx/v3/jwt"
-	xlog "gitlab.com/mokhax/spike/pkg/log"
+	"github.com/xlgmokha/x/pkg/log"
 )
 
 func TokenFrom(r *http.Request) jwt.Token {
@@ -22,7 +22,7 @@ func TokenFrom(r *http.Request) jwt.Token {
 	)
 
 	if err != nil {
-		xlog.WithFields(r, xlog.Fields{"error": err})
+		log.WithFields(r.Context(), log.Fields{"error": err})
 		return jwt.New()
 	}