diff --git a/daemon/albatross_console.ml b/daemon/albatross_console.ml index 3321d96..74d7662 100644 --- a/daemon/albatross_console.ml +++ b/daemon/albatross_console.ml @@ -163,7 +163,7 @@ let jump _ systemd influx tmpdir = Albatross_cli.set_tmpdir tmpdir; Lwt_main.run (Albatross_cli.init_influx "albatross_console" influx; - Vmm_lwt.server_socket systemd `Console >>= fun s -> + Vmm_lwt.server_socket ~systemd `Console >>= fun s -> let rec loop () = Lwt_unix.accept s >>= fun (cs, addr) -> m `Open; diff --git a/daemon/albatross_log.ml b/daemon/albatross_log.ml index a1e0051..4695957 100644 --- a/daemon/albatross_log.ml +++ b/daemon/albatross_log.ml @@ -161,7 +161,7 @@ let jump _ systemd file read_only influx tmpdir = Lwt.return_unit end else begin Albatross_cli.init_influx "albatross_log" influx; - Vmm_lwt.server_socket systemd `Log >>= fun s -> + Vmm_lwt.server_socket ~systemd `Log >>= fun s -> let ring = Vmm_ring.create `Startup () in List.iter (Vmm_ring.write ring) entries ; let mvar = Lwt_mvar.create_empty () in diff --git a/daemon/albatrossd.ml b/daemon/albatrossd.ml index d3c44e3..d9953ed 100644 --- a/daemon/albatrossd.ml +++ b/daemon/albatrossd.ml @@ -165,7 +165,7 @@ let jump _ systemd influx tmpdir dbdir retries enable_stats = else Lwt.return_none) >>= fun s -> Lwt.catch - (fun () -> Vmm_lwt.server_socket systemd `Vmmd) + (fun () -> Vmm_lwt.server_socket ~systemd `Vmmd) (fun e -> let str = Fmt.strf "unable to create server socket %a: %s" diff --git a/src/vmm_lwt.ml b/src/vmm_lwt.ml index 2adc7a1..d370f05 100644 --- a/src/vmm_lwt.ml +++ b/src/vmm_lwt.ml @@ -12,7 +12,7 @@ let safe_close fd = (fun () -> Lwt_unix.close fd) (fun _ -> Lwt.return_unit) -let server_socket systemd sock = +let server_socket ~systemd sock = if systemd then match Vmm_unix.sd_listen_fds () with | Some [fd] -> Lwt.return (Lwt_unix.of_unix_file_descr fd) diff --git a/src/vmm_lwt.mli b/src/vmm_lwt.mli index 6950320..fc8b26d 100644 --- a/src/vmm_lwt.mli +++ b/src/vmm_lwt.mli @@ -2,7 +2,7 @@ val pp_sockaddr : Format.formatter -> Lwt_unix.sockaddr -> unit -val server_socket : bool -> Vmm_core.service -> Lwt_unix.file_descr Lwt.t +val server_socket : systemd:bool -> Vmm_core.service -> Lwt_unix.file_descr Lwt.t val connect : Lwt_unix.socket_domain -> Lwt_unix.sockaddr -> Lwt_unix.file_descr option Lwt.t diff --git a/stats/albatross_stats.ml b/stats/albatross_stats.ml index 8697032..7e6a904 100644 --- a/stats/albatross_stats.ml +++ b/stats/albatross_stats.ml @@ -72,7 +72,7 @@ let jump _ systemd interval influx tmpdir = let interval = Duration.(to_f (of_sec interval)) in Lwt_main.run (Albatross_cli.init_influx "albatross_stats" influx; - Vmm_lwt.server_socket systemd `Stats >>= fun s -> + Vmm_lwt.server_socket ~systemd `Stats >>= fun s -> let _ev = Lwt_engine.on_timer interval true (fun _e -> Lwt.async timer) in let rec loop () = Lwt_unix.accept s >>= fun (cs, addr) ->