Merge pull request #822 from Julow/lwt_log_to_logs

Migrate from Lwt_log to Logs

Author: smorimoto

dune-project

@@ -33,10 +33,9 @@ The client-side code is compiled to JS using Ocsigen Js_of_ocaml or to Wasm usin
   (js_of_ocaml-ppx (>= 6.0))
   (js_of_ocaml-ppx_deriving_json (>= 6.0))
   (js_of_ocaml-tyxml (>= 6.0))
-  lwt_log
+  logs
   (tyxml (and (>= 4.6) (< 4.7)))
   (ocsigenserver (and (>= 6.0) (< 7.0)))
-  lwt_log
   (ipaddr (>= 2.1))
   (reactiveData (>= 0.2.1))
   base-bytes

eliom.opam

@@ -29,7 +29,7 @@ depends: [
   "js_of_ocaml-ppx" {>= "6.0"}
   "js_of_ocaml-ppx_deriving_json" {>= "6.0"}
   "js_of_ocaml-tyxml" {>= "6.0"}
-  "lwt_log"
+  "logs"
   "tyxml" {>= "4.6" & < "4.7"}
   "ocsigenserver" {>= "6.0" & < "7.0"}
   "ipaddr" {>= "2.1"}

src/lib/client/dune

@@ -22,9 +22,10 @@
   js_of_ocaml
   js_of_ocaml-tyxml
   js_of_ocaml-lwt
-  js_of_ocaml-lwt.logger
   lwt_react
   ocsigenserver.baselib.base
+  logs
+  logs.browser
   cohttp
   tyxml
   reactiveData)

src/lib/client/eliommod_dom.ml

@@ -22,7 +22,7 @@ open Lwt.Syntax
 open Js_of_ocaml
 open Eliom_lib
 
-let section = Lwt_log.Section.make "eliom:dom"
+let section = Logs.Src.create "eliom:dom"
 
 let iter_nodeList nodeList f =
   for i = 0 to nodeList##.length - 1 do
@@ -420,14 +420,20 @@ let html_document (src : Dom.element Dom.document Js.t) registered_process_node
   | Some e -> (
     try Dom_html.document##(adoptNode (e :> Dom.element Js.t))
     with exn -> (
-      Lwt_log.ign_debug ~section ~exn "can't adopt node, import instead";
+      Logs.debug ~src:section (fun fmt ->
+        fmt
+          ("can't adopt node, import instead" ^^ "@\n%s")
+          (Printexc.to_string exn));
       try Dom_html.document##(importNode (e :> Dom.element Js.t) Js._true)
       with exn ->
-        Lwt_log.ign_debug ~section ~exn "can't import node, copy instead";
+        Logs.debug ~src:section (fun fmt ->
+          fmt
+            ("can't import node, copy instead" ^^ "@\n%s")
+            (Printexc.to_string exn));
         copy_element content registered_process_node))
   | None ->
-      Lwt_log.ign_debug ~section
-        "can't adopt node, document not parsed as html. copy instead";
+      Logs.debug ~src:section (fun fmt ->
+        fmt "can't adopt node, document not parsed as html. copy instead");
       copy_element content registered_process_node
 
 (** CSS preloading. *)
@@ -627,7 +633,10 @@ and rewrite_css_import ?(charset = "") ~max ~prefix ~media css pos =
       with
       | Incorrect_url -> Lwt.return ([], rewrite_css_url ~prefix css pos)
       | exn ->
-          Lwt_log.ign_info ~section ~exn "Error while importing css";
+          Logs.info ~src:section (fun fmt ->
+            fmt
+              ("Error while importing css" ^^ "@\n%s")
+              (Printexc.to_string exn));
           Lwt.return ([], rewrite_css_url ~prefix css pos))
 
 let max_preload_depth = ref 4
@@ -666,9 +675,11 @@ let preload_css (doc : Dom_html.element Js.t) =
     (fun (e, css) ->
        try Dom.replaceChild (get_head doc) css e
        with _ ->
-         (* Node was a unique node that has been removed...
+         Logs.info
+           ~src:
+             (* Node was a unique node that has been removed...
                        in a perfect settings we won't have parsed it... *)
-         Lwt_log.ign_info ~section "Unique CSS skipped...")
+             section (fun fmt -> fmt "Unique CSS skipped..."))
     css;
   if !Eliom_config.debug_timings
   then Console.console##(timeEnd (Js.string "preload_css (fetch+rewrite)"));

src/lib/client/eliommod_dom.mli

@@ -101,4 +101,4 @@ val onhashchange : (Js.js_string Js.t -> unit) -> unit
 
 val touch_base : unit -> unit
 val add_formdata_hack_onclick_handler : unit -> unit
-val section : Lwt_log_core.section
+val section : Logs.src

src/lib/eliom_bus.client.ml

@@ -23,7 +23,7 @@ open Lwt.Syntax
 
 open Eliom_lib
 
-let section = Lwt_log.Section.make "eliom:bus"
+let section = Logs.Src.create "eliom:bus"
 
 module Ecb = Eliom_comet_base
 

src/lib/eliom_bus.client.mli

@@ -64,4 +64,4 @@ val set_time_before_flush : ('a, 'b) t -> float -> unit
 (**/**)
 
 val force_link : unit
-val section : Lwt_log_core.section
+val section : Logs.src