X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsessiond-config.c;h=f1e3dea9dd27ee726e67a311f6f118a9981628f6;hp=587f2f82dfd1e676bd63ff40494ae98bd80962ec;hb=f17b873261bab722b58f21aabd3fcb44a0bbc20d;hpb=2288467f63826a06d25ac361fa04ea92ec7ddfa3

diff --git a/src/bin/lttng-sessiond/sessiond-config.c b/src/bin/lttng-sessiond/sessiond-config.c
index 587f2f82d..f1e3dea9d 100644
--- a/src/bin/lttng-sessiond/sessiond-config.c
+++ b/src/bin/lttng-sessiond/sessiond-config.c
@@ -15,6 +15,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "version.h"
 #include "sessiond-config.h"
 #include <assert.h>
 #include "lttng-ust-ctl.h"
@@ -269,13 +270,16 @@ int sessiond_config_init(struct sessiond_config *config)
 	} else {
 		ret = config_set_paths_non_root(config);
 	}
+	if (ret < 0) {
+		goto error;
+	}
 
 	/* 32 bits consumerd path setup */
 	ret = asprintf(&str, DEFAULT_USTCONSUMERD32_PATH,
 			config->rundir.value);
 	if (ret < 0) {
 		ERR("Failed to set 32-bit consumer path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->consumerd32_path, str);
 	str = NULL;
@@ -284,7 +288,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			config->rundir.value);
 	if (ret < 0) {
 		ERR("Failed to set 32-bit consumer error socket path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->consumerd32_err_unix_sock_path, str);
 	str = NULL;
@@ -293,7 +297,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			config->rundir.value);
 	if (ret < 0) {
 		ERR("Failed to set 32-bit consumer command socket path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->consumerd32_cmd_unix_sock_path, str);
 	str = NULL;
@@ -303,7 +307,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			config->rundir.value);
 	if (ret < 0) {
 		ERR("Failed to set 64-bit consumer path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->consumerd64_path, str);
 	str = NULL;
@@ -312,7 +316,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			config->rundir.value);
 	if (ret < 0) {
 		ERR("Failed to set 64-bit consumer error socket path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->consumerd64_err_unix_sock_path, str);
 	str = NULL;
@@ -321,7 +325,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			config->rundir.value);
 	if (ret < 0) {
 		ERR("Failed to set 64-bit consumer command socket path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->consumerd64_cmd_unix_sock_path, str);
 	str = NULL;
@@ -331,7 +335,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			config->rundir.value);
 	if (ret < 0) {
 		ERR("Failed to set kernel consumer path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->kconsumerd_path, str);
 	str = NULL;
@@ -340,7 +344,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			config->rundir.value);
 	if (ret < 0) {
 		ERR("Failed to set kernel consumer error socket path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->kconsumerd_err_unix_sock_path, str);
 	str = NULL;
@@ -349,7 +353,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			config->rundir.value);
 	if (ret < 0) {
 		ERR("Failed to set kernel consumer command socket path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->kconsumerd_cmd_unix_sock_path, str);
 	str = NULL;
@@ -358,7 +362,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			DEFAULT_LTTNG_SESSIOND_PIDFILE);
 	if (ret < 0) {
 		ERR("Failed to set PID file path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->pid_file_path, str);
 	str = NULL;
@@ -367,7 +371,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			DEFAULT_LTTNG_SESSIOND_LOCKFILE);
 	if (ret < 0) {
 		ERR("Failed to set lock file path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->lock_file_path, str);
 	str = NULL;
@@ -376,7 +380,7 @@ int sessiond_config_init(struct sessiond_config *config)
 			DEFAULT_LTTNG_SESSIOND_AGENTPORT_FILE);
 	if (ret < 0) {
 		ERR("Failed to set agent port file path");
-		goto end;
+		goto error;
 	}
 	config_string_set(&config->agent_port_file_path, str);
 	str = NULL;
@@ -400,7 +404,9 @@ int sessiond_config_init(struct sessiond_config *config)
 #error "Unknown bitness"
 #endif
 	ret = 0;
-end:
+	return ret;
+error:
+	sessiond_config_fini(config);
 	return ret;
 }
 
@@ -410,6 +416,7 @@ void sessiond_config_fini(struct sessiond_config *config)
 	config_string_fini(&config->tracing_group_name);
 	config_string_fini(&config->kmod_probes_list);
 	config_string_fini(&config->kmod_extra_probes_list);
+	config_string_fini(&config->rundir);
 	config_string_fini(&config->apps_unix_sock_path);
 	config_string_fini(&config->client_unix_sock_path);
 	config_string_fini(&config->wait_shm_path);
@@ -491,32 +498,58 @@ LTTNG_HIDDEN
 void sessiond_config_log(struct sessiond_config *config)
 {
 	DBG_NO_LOC("[sessiond configuration]");
-	DBG_NO_LOC("\tverbose:                      %i", config->verbose);
-	DBG_NO_LOC("\tverbose consumer:             %i", config->verbose_consumer);
-	DBG_NO_LOC("\tquiet mode:                   %s", config->quiet ? "True" : "False");
+	DBG_NO_LOC("\tversion                        %s", VERSION);
+	if (GIT_VERSION[0] != '\0') {
+		DBG_NO_LOC("\tgit version                    %s", GIT_VERSION);
+	}
+	if (EXTRA_VERSION_NAME[0] != '\0') {
+		DBG_NO_LOC("\textra version name             %s", EXTRA_VERSION_NAME);
+	}
+	if (EXTRA_VERSION_DESCRIPTION[0] != '\0') {
+		DBG_NO_LOC("\textra version description:\n\t%s", EXTRA_VERSION_DESCRIPTION);
+	}
+	if (EXTRA_VERSION_PATCHES[0] != '\0') {
+		DBG_NO_LOC("\textra version patches:\n\t%s", EXTRA_VERSION_PATCHES);
+	}
+	DBG_NO_LOC("\tverbose:                       %i", config->verbose);
+	DBG_NO_LOC("\tverbose consumer:              %i", config->verbose_consumer);
+	DBG_NO_LOC("\tquiet mode:                    %s", config->quiet ? "True" : "False");
 	if (config->agent_tcp_port.begin == config->agent_tcp_port.end) {
-		DBG_NO_LOC("\tagent_tcp_port:               %i", config->agent_tcp_port.begin);
+		DBG_NO_LOC("\tagent_tcp_port:                %i", config->agent_tcp_port.begin);
 	} else {
-		DBG_NO_LOC("\tagent_tcp_port:               [%i, %i]",
+		DBG_NO_LOC("\tagent_tcp_port:                [%i, %i]",
 				config->agent_tcp_port.begin,
 				config->agent_tcp_port.end);
 	}
-	DBG_NO_LOC("\tapplication socket timeout:   %i", config->app_socket_timeout);
-	DBG_NO_LOC("\tno-kernel:                    %s", config->no_kernel ? "True" : "False");
-	DBG_NO_LOC("\tbackground:                   %s", config->background ? "True" : "False");
-	DBG_NO_LOC("\tdaemonize:                    %s", config->daemonize ? "True" : "False");
-	DBG_NO_LOC("\tsignal parent on start:       %s", config->sig_parent ? "True" : "False");
-	DBG_NO_LOC("\ttracing group name:           %s", config->tracing_group_name.value ? : "Unknown");
-	DBG_NO_LOC("\tkmod_probe_list:              %s", config->kmod_probes_list.value ? : "None");
-	DBG_NO_LOC("\tkmod_extra_probe_list:        %s", config->kmod_extra_probes_list.value ? : "None");
-	DBG_NO_LOC("\trundir:                       %s", config->rundir.value ? : "Unknown");
-	DBG_NO_LOC("\tapplication socket path:      %s", config->apps_unix_sock_path.value ? : "Unknown");
-	DBG_NO_LOC("\tclient socket path:           %s", config->client_unix_sock_path.value ? : "Unknown");
-	DBG_NO_LOC("\twait shm path:                %s", config->wait_shm_path.value ? : "Unknown");
-	DBG_NO_LOC("\thealth socket path:           %s", config->health_unix_sock_path.value ? : "Unknown");
-	DBG_NO_LOC("\tLTTNG_UST_CLOCK_PLUGIN:       %s", config->lttng_ust_clock_plugin.value ? : "None");
-	DBG_NO_LOC("\tpid file path:                %s", config->pid_file_path.value ? : "Unknown");
-	DBG_NO_LOC("\tlock file path:               %s", config->lock_file_path.value ? : "Unknown");
-	DBG_NO_LOC("\tsession load path:            %s", config->load_session_path.value ? : "None");
-	DBG_NO_LOC("\tagent port file path:         %s", config->agent_port_file_path.value ? : "Unknown");
+	DBG_NO_LOC("\tapplication socket timeout:    %i", config->app_socket_timeout);
+	DBG_NO_LOC("\tno-kernel:                     %s", config->no_kernel ? "True" : "False");
+	DBG_NO_LOC("\tbackground:                    %s", config->background ? "True" : "False");
+	DBG_NO_LOC("\tdaemonize:                     %s", config->daemonize ? "True" : "False");
+	DBG_NO_LOC("\tsignal parent on start:        %s", config->sig_parent ? "True" : "False");
+	DBG_NO_LOC("\ttracing group name:            %s", config->tracing_group_name.value ? : "Unknown");
+	DBG_NO_LOC("\tkmod_probe_list:               %s", config->kmod_probes_list.value ? : "None");
+	DBG_NO_LOC("\tkmod_extra_probe_list:         %s", config->kmod_extra_probes_list.value ? : "None");
+	DBG_NO_LOC("\trundir:                        %s", config->rundir.value ? : "Unknown");
+	DBG_NO_LOC("\tapplication socket path:       %s", config->apps_unix_sock_path.value ? : "Unknown");
+	DBG_NO_LOC("\tclient socket path:            %s", config->client_unix_sock_path.value ? : "Unknown");
+	DBG_NO_LOC("\twait shm path:                 %s", config->wait_shm_path.value ? : "Unknown");
+	DBG_NO_LOC("\thealth socket path:            %s", config->health_unix_sock_path.value ? : "Unknown");
+	DBG_NO_LOC("\tLTTNG_UST_CLOCK_PLUGIN:        %s", config->lttng_ust_clock_plugin.value ? : "None");
+	DBG_NO_LOC("\tpid file path:                 %s", config->pid_file_path.value ? : "Unknown");
+	DBG_NO_LOC("\tlock file path:                %s", config->lock_file_path.value ? : "Unknown");
+	DBG_NO_LOC("\tsession load path:             %s", config->load_session_path.value ? : "None");
+	DBG_NO_LOC("\tagent port file path:          %s", config->agent_port_file_path.value ? : "Unknown");
+	DBG_NO_LOC("\tconsumerd32 path:              %s", config->consumerd32_path.value ? : "Unknown");
+	DBG_NO_LOC("\tconsumerd32 bin path:          %s", config->consumerd32_bin_path.value ? : "Unknown");
+	DBG_NO_LOC("\tconsumerd32 lib dir:           %s", config->consumerd32_lib_dir.value ? : "Unknown");
+	DBG_NO_LOC("\tconsumerd32 err unix sock path:%s", config->consumerd32_err_unix_sock_path.value ? : "Unknown");
+	DBG_NO_LOC("\tconsumerd32 cmd unix sock path:%s", config->consumerd32_cmd_unix_sock_path.value ? : "Unknown");
+	DBG_NO_LOC("\tconsumerd64 path:              %s", config->consumerd64_path.value ? : "Unknown");
+	DBG_NO_LOC("\tconsumerd64 bin path:          %s", config->consumerd64_bin_path.value ? : "Unknown");
+	DBG_NO_LOC("\tconsumerd64 lib dir:           %s", config->consumerd64_lib_dir.value ? : "Unknown");
+	DBG_NO_LOC("\tconsumerd64 err unix sock path:%s", config->consumerd64_err_unix_sock_path.value ? : "Unknown");
+	DBG_NO_LOC("\tconsumerd64 cmd unix sock path:%s", config->consumerd64_cmd_unix_sock_path.value ? : "Unknown");
+	DBG_NO_LOC("\tkconsumerd path:               %s", config->kconsumerd_path.value ? : "Unknown");
+	DBG_NO_LOC("\tkconsumerd err unix sock path: %s", config->kconsumerd_err_unix_sock_path.value ? : "Unknown");
+	DBG_NO_LOC("\tkconsumerd cmd unix sock path: %s", config->kconsumerd_cmd_unix_sock_path.value ? : "Unknown");
 }