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

Detect datadir by platform

Browse source
This commit is contained in:
Reynir Björnsson 2021-11-12 14:01:40 +01:00 committed by Robur
parent e15bd00fe5
commit 977678b325
4 changed files with 50 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bin/builder_db.ml
View file

@ -4,10 +4,10 @@ let ( let+ ) x f = Result.map f x
let or_die exit_code = function
| Ok r -> r
| Error (`Msg msg) ->
Format.eprintf "Error: %s" msg;
Format.eprintf "Error: %s\n" msg;
exit exit_code
| Error (#Caqti_error.t as e) ->
Format.eprintf "Database error: %a" Caqti_error.pp e;
Format.eprintf "Database error: %a\n" Caqti_error.pp e;
exit exit_code
let foreign_keys =
@ -320,22 +320,35 @@ let help man_format cmds = function
then `Help (man_format, Some cmd)
else `Error (true, "Unknown command: " ^ cmd)
let uname =
let cmd = Bos.Cmd.(v "uname" % "-s") in
lazy (match Bos.OS.Cmd.(run_out cmd |> out_string |> success) with
| Ok s when s = "FreeBSD" -> `FreeBSD
| Ok s when s = "Linux" -> `Linux
| Ok s -> invalid_arg (Printf.sprintf "OS %s not supported\n" s)
| Error (`Msg m) -> invalid_arg m)
let default_datadir =
match Lazy.force uname with
| `FreeBSD -> "/var/db/builder-web"
| `Linux -> "/var/lib/builder-web"
let dbpath =
let doc = "sqlite3 database path" in
Cmdliner.Arg.(value &
opt non_dir_file "/var/db/builder-web/builder.sqlite3" &
opt non_dir_file (default_datadir ^ "/builder.sqlite3") &
info ~doc ["dbpath"])
let dbpath_new =
let doc = "sqlite3 database path" in
Cmdliner.Arg.(value &
opt string "/var/db/builder-web/builder.sqlite3" &
opt string (default_datadir ^ "/builder.sqlite3") &
info ~doc ["dbpath"])
let datadir =
let doc = "data directory" in
Cmdliner.Arg.(value &
opt dir "/var/db/builder-web/" &
opt dir default_datadir &
info ~doc ["datadir"])
let jobname =

15
bin/builder_web_app.ml
View file

@ -120,9 +120,22 @@ let ip_port : (Ipaddr.V4.t * int) Arg.converter =
in
parse, fun ppf (ip, port) -> Format.fprintf ppf "%a:%d" Ipaddr.V4.pp ip port
let uname =
let cmd = Bos.Cmd.(v "uname" % "-s") in
lazy (match Bos.OS.Cmd.(run_out cmd |> out_string |> success) with
| Ok s when s = "FreeBSD" -> `FreeBSD
| Ok s when s = "Linux" -> `Linux
| Ok s -> invalid_arg (Printf.sprintf "OS %s not supported" s)
| Error (`Msg m) -> invalid_arg m)
let default_datadir =
match Lazy.force uname with
| `FreeBSD -> "/var/db/builder-web"
| `Linux -> "/var/lib/builder-web"
let datadir =
let doc = "data directory" in
Arg.(value & opt dir "/var/db/builder-web/" & info [ "d"; "datadir" ] ~doc)
Arg.(value & opt dir default_datadir & info [ "d"; "datadir" ] ~doc)
let port =
let doc = "port" in

17
bin/migrations/builder_migrations.ml
View file

@ -24,7 +24,7 @@ let pp_error ppf = function
let or_die exit_code = function
| Ok r -> r
| Error e ->
Format.eprintf "Database error: %a" pp_error e;
Format.eprintf "Database error: %a\n" pp_error e;
exit exit_code
let do_database_action action () datadir =
@ -59,10 +59,23 @@ let help man_format migrations = function
then `Help (man_format, Some migration)
else `Error (true, "Unknown migration: " ^ migration)
let uname =
let cmd = Bos.Cmd.(v "uname" % "-s") in
lazy (match Bos.OS.Cmd.(run_out cmd |> out_string |> success) with
| Ok s when s = "FreeBSD" -> `FreeBSD
| Ok s when s = "Linux" -> `Linux
| Ok s -> invalid_arg (Printf.sprintf "OS %s not supported" s)
| Error (`Msg m) -> invalid_arg m)
let default_datadir =
match Lazy.force uname with
| `FreeBSD -> "/var/db/builder-web"
| `Linux -> "/var/lib/builder-web"
let datadir =
let doc = "data directory containing builder.sqlite3 and data files" in
Cmdliner.Arg.(value &
opt dir "/var/db/builder-web/" &
opt dir default_datadir &
info ~doc ["datadir"])
let setup_log =

6
bin/migrations/m20210308.ml
View file

@ -10,13 +10,13 @@ let broken_builds =
WHERE a.build = b.id and a.filepath = b.main_binary) = 0
|}
let fixup _datadir (module Db : Caqti_blocking.CONNECTION) =
let fixup datadir (module Db : Caqti_blocking.CONNECTION) =
let open Grej.Infix in
Grej.check_version ~user_version:3L (module Db) >>= fun () ->
Db.rev_collect_list broken_builds () >>= fun broken_builds ->
Grej.list_iter_result
(fun ((build, uuid, job_name) : [`build] Rep.id * Uuidm.t * string) ->
Format.printf "Removing job %a.\nPlease clean up data files in /var/db/builder-web/%s/%a\n"
Uuidm.pp uuid job_name Uuidm.pp uuid;
Format.printf "Removing job %a.\nPlease clean up data files in %a/%s/%a\n"
Uuidm.pp uuid Fpath.pp datadir job_name Uuidm.pp uuid;
Db.exec Builder_db.Build.remove build)
broken_builds