From cf7d85af4d50b95593f7f60d9fc7a9d98fac4f72 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Wed, 28 Aug 2024 14:57:47 +0200
Subject: [PATCH] web/server: log request cookies; fix old log and print-object
 stuff

---
 core/message.lisp |  4 +---
 shape/shape.lisp  |  2 +-
 web/response.lisp |  5 +++--
 web/server.lisp   | 16 +++++++++-------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/core/message.lisp b/core/message.lisp
index 89d89b9..a34ca79 100644
--- a/core/message.lisp
+++ b/core/message.lisp
@@ -18,6 +18,4 @@
   (make-instance 'message :head head :data data :sender sender))
 
 (defmethod print-object ((msg message) stream)
-  (print-unreadable-object (msg stream :type t :identity t)
-    (format stream "~s ~s <data ~s>" 
-          (shape:head msg) (sender msg) (shape:data msg))))
+  (shape:print-fields msg stream 'shape:head 'sender 'shape:data))
diff --git a/shape/shape.lisp b/shape/shape.lisp
index b41fede..f1c7b8c 100644
--- a/shape/shape.lisp
+++ b/shape/shape.lisp
@@ -3,7 +3,7 @@
 (defpackage :scopes/shape
   (:use :common-lisp)
   (:local-nicknames (:util :scopes/util))
-  (:export #:record 
+  (:export #:record #:print-fields
            #:head-fields #:head #:head-value #:head-plist
            #:data-fields #:data #:data-value))
 
diff --git a/web/response.lisp b/web/response.lisp
index edac204..58dd439 100644
--- a/web/response.lisp
+++ b/web/response.lisp
@@ -5,7 +5,8 @@
   (:local-nicknames (:core :scopes/core)
                     (:dom :scopes/web/dom)
                     (:message :scopes/core/message)
-                    (:shape :scopes/shape))
+                    (:shape :scopes/shape)
+                    (:util :scopes/util))
   (:export #:interaction #:setup #:html-response
            #:render #:render-content #:render-not-found))
 
@@ -20,7 +21,7 @@
   (format s "<interaction ~s>" (messages ia)))
 
 (defmethod core:send ((ia interaction) msg)
-  (log:debug "receiving ~s" msg)
+  (util:lgd msg)
   (push msg (messages ia)))
 
 ;;;; response definitions
diff --git a/web/server.lisp b/web/server.lisp
index f05fda3..36b27f2 100644
--- a/web/server.lisp
+++ b/web/server.lisp
@@ -36,11 +36,13 @@
 
 (defun app (ctx env)
   ;(handler-case ...
-  (log:info "request: ~a ~a, accept: ~a" 
-            (getf env :request-method) 
-            (getf env :request-uri)
-            (gethash "accept" (getf env :headers)))
-  ;(log:debug "request: ~s" env)
+  (let* ((method (getf env :request-method))
+         (uri (getf env :request-uri))
+         (headers (getf env :headers))
+         (accept (gethash "accept" headers))
+         (cookies (gethash "cookie" headers)))
+    (util:lgi method uri accept cookies))
+  ;(util:lgd env)
   (funcall (select-app ctx env)))
 
 (defun start (ctx)
@@ -52,7 +54,7 @@
                      ;:server :woo
                      :debug nil
                      :silent t))
-    (log:info "port: ~a." (port cfg))
+    (util:lgi (port cfg))
     ctx))
 
 (defun stop (ctx)
@@ -88,7 +90,7 @@
          (msg (message:create 
                 (head env) :data (plist (post-data env)) :sender iact))
          (resp (response:setup ctx env :html-responder html-responder)))
-    (log:debug "msg ~s" msg)
+    (util:lgd msg)
     ; (check-auth ctx msg env) => (response:render-unauthorized resp)
     (if (core:handle-message ctx msg)
       (response:render resp iact)