From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 10 Apr 2018 18:40:32 +0000 (-0400)
Subject: Fix: quiet option is not set in sessiond-config
X-Git-Tag: v2.11.0-rc1~277
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=6d9a9c6575be8bcf86f404236a0f4a78b4889881;ds=sidebyside

Fix: quiet option is not set in sessiond-config

The quiet option is currently set directly while parsing the
command line options of the lttng-sessiond. Since it is not
set in the sessiond configuration object, its default value
(false) overwrites the lttng_opt_quiet option when the
configuration is applied.

Reported-by: Stanislav Vovk <stanislav.vovk@windriver.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index db92191c8..4968ee2a9 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -4929,7 +4929,7 @@ static int set_option(int opt, const char *arg, const char *optname)
 	} else if (string_match(optname, "no-kernel")) {
 		config.no_kernel = true;
 	} else if (string_match(optname, "quiet") || opt == 'q') {
-		lttng_opt_quiet = true;
+		config.quiet = true;
 	} else if (string_match(optname, "verbose") || opt == 'v') {
 		/* Verbose level can increase using multiple -v */
 		if (arg) {