From ad02ba0fe56568c050098f547e5f54d4f1005f33 Mon Sep 17 00:00:00 2001 From: swrup Date: Fri, 7 Nov 2025 15:08:09 +0100 Subject: [PATCH] --- unikernel/server.ml | 2 +- unikernel/unikernel.ml | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/unikernel/server.ml b/unikernel/server.ml index 874cc8ec..0ce5576f 100644 --- a/unikernel/server.ml +++ b/unikernel/server.ml @@ -1,4 +1,4 @@ -let src = Logs.Src.create "server" +let src = Logs.Src.create "unikernel server" module Log = (val Logs.src_log src : Logs.LOG) module Method = Mte.Method diff --git a/unikernel/unikernel.ml b/unikernel/unikernel.ml index c9345278..e5ce64bd 100644 --- a/unikernel/unikernel.ml +++ b/unikernel/unikernel.ml @@ -276,20 +276,25 @@ struct let (`Initialized th) = Paf.serve http_1_1_service http_server in th - let test_pgx { pgx_database; pgx_port; pgx_hostname; pgx_user; pgx_password } - pgx () = - let module Pgx = (val pgx : Pgx_lwt.S) in - Pgx.with_conn ~user:pgx_user ~host:pgx_hostname ~password:pgx_password - ~port:pgx_port ~database:pgx_database (fun _conn -> - Logs.info (fun m -> m "Pgx.with_conn callback~~"); - Lwt.return_unit) - let start assets_ro certificate_ro key_ro tcpv4v6 http_server stack happy_eyeballs pgx_setup = - let open Lwt.Syntax in + Logs.set_reporter (Logs_fmt.reporter ()); Logs.(set_level (Some Info)); + let open Lwt.Syntax in let pgx = Pgx_mirage.connect (stack, happy_eyeballs) in - let* () = test_pgx pgx_setup pgx () in + let module Pgx = (val pgx : Pgx_lwt.S) in + let { pgx_database; pgx_port; pgx_hostname; pgx_user; pgx_password } = + pgx_setup + in + Pgx.with_conn ~user:pgx_user ~host:pgx_hostname ~password:pgx_password + ~port:pgx_port ~database:pgx_database + @@ fun conn -> + let* () = + let+ alive = Pgx.alive conn in + match alive with + | false -> Fmt.failwith "Pgx connection failure: connection not alive" + | true -> Logs.info (fun m -> m "Pgx connection success") + in let* assets_res = Assets.assets assets_ro in match assets_res with | Error (`Msg m) -> Fmt.failwith "Assets configuration error: %s." m