[PATCH lttng-tools] Fix: cmd line options overwrite env variable config options

[PATCH lttng-tools] Fix: cmd line options overwrite env variable config options

[Jonathan Rajotte]

The doc is clear about the order of precedence regarding configuration.

The command line options always override any config file or
configuration by environment variables.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
 src/bin/lttng-sessiond/main.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 37c0a932..de8df2e0 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -5775,6 +5775,12 @@ int main(int argc, char **argv)
 		goto exit_set_signal_handler;
 	}
 
+	/* 
+	 * Init config from environment variables.
+	 * Command line option override env configuration per-doc. Do env first.
+	 */
+	sessiond_config_apply_env_config(&config);
+
 	/*
 	 * Parse arguments and load the daemon configuration file.
 	 *
@@ -5789,9 +5795,6 @@ int main(int argc, char **argv)
 		goto exit_options;
 	}
 
-	/* Init config from environment variables. */
-	sessiond_config_apply_env_config(&config);
-
 	/*
 	 * Resolve all paths received as arguments, configuration option, or
 	 * through environment variable as absolute paths. This is necessary
-- 
2.17.0

_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Re: [PATCH lttng-tools] Fix: cmd line options overwrite env variable config options

[Jérémie Galarneau]

[-- Attachment #1.1: Type: text/plain, Size: 1730 bytes --]

Merged in master and stable-2.10 with a minor fix.

Thanks!
Jérémie


On 18 May 2018 at 17:45, Jonathan Rajotte <
jonathan.rajotte-julien@efficios.com> wrote:

> The doc is clear about the order of precedence regarding configuration.
>
> The command line options always override any config file or
> configuration by environment variables.
>
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
> ---
>  src/bin/lttng-sessiond/main.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
> index 37c0a932..de8df2e0 100644
> --- a/src/bin/lttng-sessiond/main.c
> +++ b/src/bin/lttng-sessiond/main.c
> @@ -5775,6 +5775,12 @@ int main(int argc, char **argv)
>                 goto exit_set_signal_handler;
>         }
>
> +       /*
>

There's a trailing whitespace here ^.


> +        * Init config from environment variables.
> +        * Command line option override env configuration per-doc. Do env
> first.
> +        */
> +       sessiond_config_apply_env_config(&config);
> +
>         /*
>          * Parse arguments and load the daemon configuration file.
>          *
> @@ -5789,9 +5795,6 @@ int main(int argc, char **argv)
>                 goto exit_options;
>         }
>
> -       /* Init config from environment variables. */
> -       sessiond_config_apply_env_config(&config);
> -
>         /*
>          * Resolve all paths received as arguments, configuration option,
> or
>          * through environment variable as absolute paths. This is
> necessary
> --
> 2.17.0
>
>


-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com

[-- Attachment #1.2: Type: text/html, Size: 2722 bytes --]

[-- Attachment #2: Type: text/plain, Size: 156 bytes --]

_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev