swrup/mte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

print App logs to stdout

Browse source
This commit is contained in:
swrup 2025-11-30 09:30:40 +01:00
parent c06fbf3b89
commit f468380451
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/devices.ml
View file

@ -16,7 +16,9 @@ let db_connection : (env, Caqti_miou.connection) Vif.Device.device =
match Pg.preflight conn with match Pg.preflight conn with
| Error err -> | Error err ->
Fmt.failwith "Database preflight failure: %a." Caqti_error.pp 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 module Secmod_signkey = struct
(* TODO (* TODO

4
src/mte.ml
View file

@ -36,7 +36,7 @@ let () =
let cfg = let cfg =
let port = Config.Exchange.port in let port = Config.Exchange.port in
let sockaddr = Unix.(ADDR_INET (inet_addr_loopback, 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 in
Miou_unix.run @@ fun () -> Miou_unix.run @@ fun () ->
Caqti_miou.Switch.run @@ fun caqti_switch -> Caqti_miou.Switch.run @@ fun caqti_switch ->
@ -49,5 +49,5 @@ let () =
in in
let middlewares = Vif.Middlewares.[] in let middlewares = Vif.Middlewares.[] in
Logs.info (fun m -> 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 Vif.run ~cfg ~devices ~middlewares routes env

11
src/util.ml
View file

@ -122,7 +122,7 @@ module Log_reporter = struct
let detail s = Logs.Tag.(empty |> add detail_tag s) let detail s = Logs.Tag.(empty |> add detail_tag s)
let time_anchor = Ptime_clock.now () |> Ptime.to_span let time_anchor = Ptime_clock.now () |> Ptime.to_span
let log_level_color = function let color_of_log_level = function
| Logs.App -> `White | Logs.App -> `White
| Error -> `Red | Error -> `Red
| Warning -> `Yellow | Warning -> `Yellow
@ -133,7 +133,7 @@ module Log_reporter = struct
let open Fmt in let open Fmt in
let pp_timestamp = styled `Faint (styled (`Fg `White) (fmt "%04.02f")) in let pp_timestamp = styled `Faint (styled (`Fg `White) (fmt "%04.02f")) in
let pp_header ppf v = 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 let pp = styled (`Fg color) Logs.pp_header in
pf ppf "%a" pp v pf ppf "%a" pp v
in in
@ -143,7 +143,11 @@ module Log_reporter = struct
in in
let pp_detail = option (styled `Green (fmt " (%s)")) in let pp_detail = option (styled `Green (fmt " (%s)")) in
let report src lvl ~over k msgf = 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 k _ppf = over (); k () in
let with_detail h tags k user_fmt = let with_detail h tags k user_fmt =
let detail = Option.bind tags (Logs.Tag.find detail_tag) in 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.set_level ~all:false (Some Logs.Debug);
Logs.Src.set_level Logs.default (Some Logs.Debug); Logs.Src.set_level Logs.default (Some Logs.Debug);
Logs_threaded.enable (); Logs_threaded.enable ();
Printexc.record_backtrace true;
() ()
end end