X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=e032e037c3ebf933f0caa216cd292578fbb7e9ae;hp=3d2cad9361464534128a44f5917d01f1e58899fe;hb=2788b49461149181a831ef23eb160921593e15fb;hpb=8b0d46366f5c87043d22aa29b9f26e5249bf7c3a

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 3d2cad936..e032e037c 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -5830,6 +5830,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.
 	 *
@@ -5844,9 +5850,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