From 606e4750e01d3689292932d9cf50f7eaeac65304 Mon Sep 17 00:00:00 2001 From: swrup Date: Fri, 7 Nov 2025 17:34:27 +0100 Subject: [PATCH] --- Makefile | 2 +- dune-project | 2 +- dune-workspace | 2 +- unikernel/config.ml | 6 +++--- unikernel/dune | 2 +- unikernel/unikernel.ml | 12 ++++++------ 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 31b40978..ce35131d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Generated by mirage.v4.10.3 +# Generated by mirage.v4.10.1 -include Makefile.user BUILD_DIR = unikernel/ diff --git a/dune-project b/dune-project index e06b4ae5..d020ffa9 100644 --- a/dune-project +++ b/dune-project @@ -4,4 +4,4 @@ (implicit_transitive_deps true) -;; Generated by mirage.v4.10.3 +;; Generated by mirage.v4.10.1 diff --git a/dune-workspace b/dune-workspace index 9f714f25..743ecfad 100644 --- a/dune-workspace +++ b/dune-workspace @@ -2,4 +2,4 @@ (context (default)) -;; Generated by mirage.v4.10.3 +;; Generated by mirage.v4.10.1 diff --git a/unikernel/config.ml b/unikernel/config.ml index 639cc5a0..89f8783b 100644 --- a/unikernel/config.ml +++ b/unikernel/config.ml @@ -6,9 +6,9 @@ let packages = [ package "digestif"; package ~min:"0.0.9" "mimic-happy-eyeballs"; package "hxd" ~sublibs:[ "core"; "string" ]; package "rresult"; - package "h2" ~min:"0.13.0"; package "pgx"; package "pgx_lwt"; - package "pgx_lwt_mirage"; package "logs"; package "mirage-logs"; - package "conduit"; package "duration"; + package ~min:"0.13.0" "h2"; package ~min:"10.0.0" "dns-client"; + package "pgx"; package "pgx_lwt"; package "pgx_lwt_mirage"; package "logs"; + package "mirage-logs"; package "conduit"; package "duration"; ] let mte = diff --git a/unikernel/dune b/unikernel/dune index d336b137..acdbca06 100644 --- a/unikernel/dune +++ b/unikernel/dune @@ -1,3 +1,3 @@ -;; Generated by mirage.v4.10.3 +;; Generated by mirage.v4.10.1 (include dune.build) diff --git a/unikernel/unikernel.ml b/unikernel/unikernel.ml index e5ce64bd..670d26d1 100644 --- a/unikernel/unikernel.ml +++ b/unikernel/unikernel.ml @@ -112,7 +112,7 @@ struct in Lwt.return @@ - let open Result.Syntax in + let ( let* ) = Result.bind in let* l = list_get_ok @@ List.map @@ -172,7 +172,7 @@ struct let*? privacy_etag, privacy_lang_l, privacy_ext_l = get ro "privacy" in Lwt.return @@ - let open Result.Syntax in + let ( let* ) = Result.bind in let* lang_l = match terms_lang_l = privacy_lang_l with | false -> @@ -268,7 +268,7 @@ struct let+ (), () = Lwt.both th0 th1 in () - let run http_server = + let run ~pgx_conn:_ http_server = let http_1_1_service = HTTP_server.http_service ~error_handler:Server.http_1_1_error_handler http_1_1_request_handler @@ -288,9 +288,9 @@ struct in Pgx.with_conn ~user:pgx_user ~host:pgx_hostname ~password:pgx_password ~port:pgx_port ~database:pgx_database - @@ fun conn -> + @@ fun pgx_conn -> let* () = - let+ alive = Pgx.alive conn in + let+ alive = Pgx.alive pgx_conn in match alive with | false -> Fmt.failwith "Pgx connection failure: connection not alive" | true -> Logs.info (fun m -> m "Pgx connection success") @@ -301,7 +301,7 @@ struct | Ok (_terms_etag, _privacy_etag, _lang_l, _ext_l) -> ( let* tls_res = tls certificate_ro key_ro in match use_tls () with - | false -> run http_server + | false -> run ~pgx_conn http_server | true -> ( match tls_res with | Error (`Msg m) ->