From a6b121a35a902cc78171335c29c5e50d87b2fcaa Mon Sep 17 00:00:00 2001 From: Jon Ludlam Date: Tue, 20 Oct 2015 17:28:47 +0100 Subject: [PATCH] CA-185669: Don't syslog lvs commands that list segments Signed-off-by: Jon Ludlam --- xenvm/lvs.ml | 2 +- xenvm/xenvm_common.ml | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xenvm/lvs.ml b/xenvm/lvs.ml index 023893c..8de7806 100644 --- a/xenvm/lvs.ml +++ b/xenvm/lvs.ml @@ -72,7 +72,7 @@ let lvs copts noheadings nosuffix units fields offline physical_device (vg_name, let inner l = Lwt_list.fold_left_s (fun acc s -> s >>= fun s -> Lwt.return (s::acc)) [] l >>= fun l -> Lwt.return (List.rev l) in inner (List.map inner rows) >>= fun rows -> let lines = print_table noheadings (" "::headings) (List.map (fun r -> " "::r) rows) in - Lwt_list.iter_s (fun x -> stdout "%s" x) lines + Lwt_list.iter_s (fun x -> stdout ~do_syslog:(not segs) "%s" x) lines ) let lvs_cmd = diff --git a/xenvm/xenvm_common.ml b/xenvm/xenvm_common.ml index aa80fc3..b4267b3 100644 --- a/xenvm/xenvm_common.ml +++ b/xenvm/xenvm_common.ml @@ -7,9 +7,11 @@ let dm = ref (module Retrymapper.Make(Devmapper.Linux) : S.RETRYMAPPER) let syslog = Lwt_log.syslog ~facility:`Daemon () -let stdout fmt = Printf.ksprintf (fun s -> - Printf.printf "%s\n%!" s; - Lwt_log.log ~logger:syslog ~level:Lwt_log.Notice ("stdout:" ^ s) +let stdout ?(do_syslog=true) fmt = Printf.ksprintf (fun s -> + Printf.printf "%s\n%!" s; + if do_syslog + then Lwt_log.log ~logger:syslog ~level:Lwt_log.Notice ("stdout:" ^ s) + else Lwt.return () ) fmt let stderr fmt = Printf.ksprintf (fun s -> Printf.fprintf stderr "%s\n%!" s;