From 15b4b4a3cae33254f31f8fd58cced54fc2d778f7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Sep 2017 14:51:23 +1000 Subject: [PATCH] tools: pass the verbosity arguments down to ratbagd Starting with -vv, we print out the ratbagd log messages to stdout/stderr, -vvv switches ratbagd to raw mode. We start at level 2 so that we can have the single -v reserved for ratbagctl itself. Signed-off-by: Peter Hutterer --- tools/ratbagctl.devel.in | 2 +- tools/toolbox.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/ratbagctl.devel.in b/tools/ratbagctl.devel.in index a1d588bc..5878460a 100755 --- a/tools/ratbagctl.devel.in +++ b/tools/ratbagctl.devel.in @@ -50,7 +50,7 @@ def main(argv): parser.print_help() return - ratbagd_process = toolbox.start_ratbagd() + ratbagd_process = toolbox.start_ratbagd(verbosity=cmd.verbose) if ratbagd_process is None: sys.exit("Failed to start or connect to ratbagd") diff --git a/tools/toolbox.py b/tools/toolbox.py index 86ced829..32ee1a5c 100644 --- a/tools/toolbox.py +++ b/tools/toolbox.py @@ -57,7 +57,7 @@ def import_non_standard_path(name, path): return module -def start_ratbagd(): +def start_ratbagd(verbosity=0): from gi.repository import Gio import time @@ -68,7 +68,14 @@ def start_ratbagd(): # FIXME: kill any running ratbagd.devel - ratbagd_process = subprocess.Popen([os.path.join('@MESON_BUILD_ROOT@', "ratbagd.devel")], shell=False) + args = [os.path.join('@MESON_BUILD_ROOT@', "ratbagd.devel")] + + if verbosity >= 3: + args.append('--verbose=raw') + elif verbosity >= 2: + args.append('--verbose') + + ratbagd_process = subprocess.Popen(args, shell=False, stdout=sys.stdout, stderr=sys.stderr) dbus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)