diff --git a/db/builder_db.ml b/db/builder_db.ml index 4c50ccb..9dbf6a7 100644 --- a/db/builder_db.ml +++ b/db/builder_db.ml @@ -260,8 +260,8 @@ module Build = struct Caqti_type.int64 t {| SELECT uuid, start_d, start_ps, finish_d, finish_ps, - result_kind, result_code, result_msg, - console, script, job + result_kind, result_code, result_msg, + console, script, job FROM build WHERE id = ? |} diff --git a/lib/builder_web.ml b/lib/builder_web.ml index 820562a..0e3719f 100644 --- a/lib/builder_web.ml +++ b/lib/builder_web.ml @@ -24,6 +24,9 @@ let init ?(pool_size = 10) dbpath = |> Result.map (fun pool -> { 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 = if Fpath.is_seg path && not (Fpath.is_rel_seg path) then Ok (Fpath.v path) @@ -183,7 +186,7 @@ let routes t = | Ok () -> Lwt.return (Response.of_plain_text "Success!") | 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) in