reynir/albatross
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

less debug output of resources

Browse source
This commit is contained in:
Hannes Mehnert 2018-03-22 23:29:58 +01:00
parent e48d3b3457
commit c978dcfb14
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vmm_engine.ml
View file

@ -110,7 +110,6 @@ let handle_disconnect state t =
{ state with console_attached ; console_counter ; log_attached }, out { state with console_attached ; console_counter ; log_attached }, out
let handle_create t prefix chain cert force = let handle_create t prefix chain cert force =
Logs.debug (fun m -> m "starting with vms %a" Vmm_resources.pp t.resources) ;
(* convert certificate to vm_config *) (* convert certificate to vm_config *)
Vmm_asn.vm_of_cert prefix cert >>= fun vm_config -> Vmm_asn.vm_of_cert prefix cert >>= fun vm_config ->
Logs.debug (fun m -> m "vm %a" pp_vm_config vm_config) ; Logs.debug (fun m -> m "vm %a" pp_vm_config vm_config) ;
@ -152,7 +151,6 @@ let handle_create t prefix chain cert force =
Vmm_commands.exec t.dir vm_config tmpfile taps >>= fun vm -> Vmm_commands.exec t.dir vm_config tmpfile taps >>= fun vm ->
Logs.debug (fun m -> m "exec()ed vm") ; Logs.debug (fun m -> m "exec()ed vm") ;
Vmm_resources.insert t.resources full vm >>= fun resources -> Vmm_resources.insert t.resources full vm >>= fun resources ->
Logs.debug (fun m -> m "%a" Vmm_resources.pp resources) ;
let stat_out = Vmm_wire.Stats.add t.stats_counter t.stats_version vm.pid vm.taps in let stat_out = Vmm_wire.Stats.add t.stats_counter t.stats_version vm.pid vm.taps in
let bridges = let bridges =
List.fold_left2 (fun b br ta -> List.fold_left2 (fun b br ta ->
@ -171,14 +169,12 @@ let handle_create t prefix chain cert force =
let handle_shutdown t vm r = let handle_shutdown t vm r =
(match Vmm_commands.shutdown vm with (match Vmm_commands.shutdown vm with
| Ok () -> () | Ok () -> ()
| Error (`Msg e) -> Logs.warn (fun m -> m "%s during shutdown" e)) ; | Error (`Msg e) -> Logs.warn (fun m -> m "%s while shutdown vm %a" e pp_vm vm)) ;
let resources = let resources =
match Vmm_resources.remove t.resources (fullname vm.config) vm with match Vmm_resources.remove t.resources (fullname vm.config) vm with
| Ok resources -> | Ok resources -> resources
Logs.debug (fun m -> m "shut down: %a" Vmm_resources.pp resources) ;
resources
| Error (`Msg e) -> | Error (`Msg e) ->
Logs.warn (fun m -> m "%s while removing vm" e) ; Logs.warn (fun m -> m "%s while removing vm %a" e pp_vm vm) ;
t.resources t.resources
in in
let bridges = let bridges =
@ -209,7 +205,6 @@ let handle_command t s prefix perms hdr buf =
let arg = if String.length buf = 0 then prefix else prefix @ [buf] in let arg = if String.length buf = 0 then prefix else prefix @ [buf] in
match x with match x with
| `Info -> | `Info ->
Logs.debug (fun m -> m "resources are %a" Vmm_resources.pp t.resources) ;
begin match Vmm_resources.find t.resources arg with begin match Vmm_resources.find t.resources arg with
| None -> | None ->
Logs.debug (fun m -> m "info: couldn't find %a" pp_id arg) ; Logs.debug (fun m -> m "info: couldn't find %a" pp_id arg) ;