From 3faa19c3aeae15070f2e143b031daaddfe296735 Mon Sep 17 00:00:00 2001
From: mo khan <mo@mokhan.ca>
Date: Thu, 27 Mar 2025 11:47:58 -0600
Subject: feat: start to add structured logging

---
 pkg/app/app.go | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'pkg/app')

diff --git a/pkg/app/app.go b/pkg/app/app.go
index 35609d7..c55ecce 100644
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -3,7 +3,6 @@ package app
 import (
 	"encoding/json"
 	"fmt"
-	"log"
 	"net"
 	"net/http"
 	"os"
@@ -14,6 +13,7 @@ import (
 	"github.com/xlgmokha/x/pkg/x"
 	"gitlab.com/mokhax/spike/pkg/authz"
 	"gitlab.com/mokhax/spike/pkg/cfg"
+	xlog "gitlab.com/mokhax/spike/pkg/log"
 	"gitlab.com/mokhax/spike/pkg/srv"
 )
 
@@ -23,6 +23,7 @@ func WithCasbin() authz.Authorizer {
 	return authz.AuthorizerFunc(func(r *http.Request) bool {
 		host, _, err := net.SplitHostPort(r.Host)
 		if err != nil {
+			xlog.WithFields(r, xlog.Fields{"error": err})
 			return false
 		}
 
@@ -32,11 +33,18 @@ func WithCasbin() authz.Authorizer {
 		}
 		ok, err := enforcer.Enforce(subject, host, r.Method, r.URL.Path)
 		if err != nil {
-			fmt.Printf("%v\n", err)
+			xlog.WithFields(r, xlog.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,
+			"subject": subject,
+			"action":  r.Method,
+			"domain":  host,
+			"object":  r.URL.Path,
+		})
 		return ok
 	})
 }
@@ -50,8 +58,10 @@ func WithCedar() authz.Authorizer {
 
 	var entities cedar.EntityMap
 	if err := json.Unmarshal(x.Must(os.ReadFile("cedar.json")), &entities); err != nil {
-		log.Fatal(err)
+		xlog.Logger.Error("Error", "error", err)
+		return nil
 	}
+
 	return authz.AuthorizerFunc(func(r *http.Request) bool {
 		host, _, err := net.SplitHostPort(r.Host)
 		if err != nil {
@@ -79,9 +89,9 @@ func WithCedar() authz.Authorizer {
 }
 
 func Start(bindAddr string) error {
+	mux := authz.HTTP(WithCasbin(), Routes())
 	return srv.Run(cfg.New(
 		bindAddr,
-		// cfg.WithMux(authz.HTTP(WithCedar(), Routes())),
-		cfg.WithMux(authz.HTTP(WithCasbin(), Routes())),
+		cfg.WithMux(mux),
 	))
 }
-- 
cgit v1.2.3