/*
- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 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"
} 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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
#error "Unknown bitness"
#endif
ret = 0;
-end:
+ return ret;
+error:
+ sessiond_config_fini(config);
return ret;
}
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);
void sessiond_config_log(struct sessiond_config *config)
{
DBG_NO_LOC("[sessiond configuration]");
+ 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");