From e6d2e8558788a81186aee73e485a5eb1ec5db2b9 Mon Sep 17 00:00:00 2001 From: swrup Date: Sun, 30 Nov 2025 09:30:40 +0100 Subject: [PATCH] --- src/devices.ml | 4 +++- src/mte.ml | 4 ++-- src/util.ml | 11 +++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/devices.ml b/src/devices.ml index fc821823..9d0ea3cd 100644 --- a/src/devices.ml +++ b/src/devices.ml @@ -16,7 +16,9 @@ let db_connection : (env, Caqti_miou.connection) Vif.Device.device = match Pg.preflight conn with | Error err -> Fmt.failwith "Database preflight failure: %a." Caqti_error.pp err - | Ok () -> conn) + | Ok () -> + Logs.debug (fun m -> m "database connection initialized.@."); + conn) module Secmod_signkey = struct (* TODO diff --git a/src/mte.ml b/src/mte.ml index 328fcb5d..6dcc275d 100644 --- a/src/mte.ml +++ b/src/mte.ml @@ -36,7 +36,7 @@ let () = let cfg = let port = Config.Exchange.port in let sockaddr = Unix.(ADDR_INET (inet_addr_loopback, port)) in - Vif.config ~reporter:Logs.nop_reporter sockaddr + Vif.config ~reporter:Util.Log_reporter.reporter sockaddr in Miou_unix.run @@ fun () -> Caqti_miou.Switch.run @@ fun caqti_switch -> @@ -49,5 +49,5 @@ let () = in let middlewares = Vif.Middlewares.[] in Logs.info (fun m -> - m ~tags:(Util.Log_reporter.detail "~~!") "Starting MTE server"); + m ~tags:(Util.Log_reporter.detail "...") "Starting MTE server"); Vif.run ~cfg ~devices ~middlewares routes env diff --git a/src/util.ml b/src/util.ml index 785958c9..51d2bfd6 100644 --- a/src/util.ml +++ b/src/util.ml @@ -122,7 +122,7 @@ module Log_reporter = struct let detail s = Logs.Tag.(empty |> add detail_tag s) let time_anchor = Ptime_clock.now () |> Ptime.to_span - let log_level_color = function + let color_of_log_level = function | Logs.App -> `White | Error -> `Red | Warning -> `Yellow @@ -133,7 +133,7 @@ module Log_reporter = struct let open Fmt in let pp_timestamp = styled `Faint (styled (`Fg `White) (fmt "%04.02f")) in let pp_header ppf v = - let color = fst v |> log_level_color in + let color = color_of_log_level (fst v) in let pp = styled (`Fg color) Logs.pp_header in pf ppf "%a" pp v in @@ -143,7 +143,11 @@ module Log_reporter = struct in let pp_detail = option (styled `Green (fmt " (%s)")) in let report src lvl ~over k msgf = - let ppf = stderr in + let ppf = + match lvl with + | Logs.App -> stdout + | Error | Warning | Info | Debug -> stderr + in let k _ppf = over (); k () in let with_detail h tags k user_fmt = let detail = Option.bind tags (Logs.Tag.find detail_tag) in @@ -167,6 +171,5 @@ module Log_reporter = struct Logs.set_level ~all:false (Some Logs.Debug); Logs.Src.set_level Logs.default (Some Logs.Debug); Logs_threaded.enable (); - Printexc.record_backtrace true; () end