This commit is contained in:
parent
0b01ef8871
commit
606e4750e0
6 changed files with 13 additions and 13 deletions
|
|
@ -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) ->
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue