Skip to content

Make --submission-service optional #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dra27 wants to merge 1 commit into from
Closed

Make --submission-service optional #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/base_images.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,14 @@ let main config mode channel capnp_address github_auth submission_uri staging_pa
let channel = Option.map read_channel_uri channel in
let staging_auth = staging_password_file |> Option.map (fun path -> staging_user, read_first_line path) in
run_capnp capnp_address >>= fun (vat, rpc_engine_resolver) ->
let submission_cap = Capnp_rpc_unix.Vat.import_exn vat submission_uri in
let submission_cap =
match Option.map (Capnp_rpc_unix.Vat.import_exn vat) submission_uri with
| Some cap -> cap
| None ->
Capnp_rpc_lwt.Cast.sturdy_of_raw @@ object
method connect = fst (Lwt.wait ())
method to_uri_with_secrets = Uri.of_string "mock sturdy-ref"
end in
let connection = Current_ocluster.Connection.create submission_cap in
let ocluster = Current_ocluster.v ?push_auth:staging_auth ~urgent:`Never connection in
let engine = Current.Engine.create ~config (Pipeline.v ?channel ~ocluster) in
Expand Down Expand Up @@ -113,7 +120,7 @@ let capnp_address =
["capnp-address"]

let submission_service =
Arg.required @@
Arg.value @@
Arg.opt Arg.(some Capnp_rpc_unix.sturdy_uri) None @@
Arg.info
~doc:"The submission.cap file for the build scheduler service"
Expand Down