robur/builder-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Whitespace, log output

Browse source
This commit is contained in:
Reynir Björnsson 2021-01-21 12:02:07 +01:00
parent a6fe9ada45
commit 22ef6395b8
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
db/builder_db.ml
View file

@ -260,8 +260,8 @@ module Build = struct
Caqti_type.int64 Caqti_type.int64
t t
{| SELECT uuid, start_d, start_ps, finish_d, finish_ps, {| SELECT uuid, start_d, start_ps, finish_d, finish_ps,
result_kind, result_code, result_msg, result_kind, result_code, result_msg,
console, script, job console, script, job
FROM build FROM build
WHERE id = ? WHERE id = ?
|} |}

5
lib/builder_web.ml
View file

@ -24,6 +24,9 @@ let init ?(pool_size = 10) dbpath =
|> Result.map (fun pool -> |> Result.map (fun pool ->
{ pool = (pool :> (Caqti_lwt.connection, [> db_error ]) Caqti_lwt.Pool.t); }) { pool = (pool :> (Caqti_lwt.connection, [> db_error ]) Caqti_lwt.Pool.t); })
let pp_exec ppf (job, uuid, _, _, _, _, _) =
Format.fprintf ppf "%s(%a)" job.Builder.name Uuidm.pp uuid
let safe_seg path = let safe_seg path =
if Fpath.is_seg path && not (Fpath.is_rel_seg path) if Fpath.is_seg path && not (Fpath.is_rel_seg path)
then Ok (Fpath.v path) then Ok (Fpath.v path)
@ -183,7 +186,7 @@ let routes t =
| Ok () -> | Ok () ->
Lwt.return (Response.of_plain_text "Success!") Lwt.return (Response.of_plain_text "Success!")
| Error e -> | Error e ->
Log.warn (fun m -> m "Error saving build: %a" pp_error e); Log.warn (fun m -> m "Error saving build %a: %a" pp_exec exec pp_error e);
Lwt.return (Response.of_plain_text "Internal server error\n" ~status:`Internal_server_error) Lwt.return (Response.of_plain_text "Internal server error\n" ~status:`Internal_server_error)
in in