X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsessiond-config.c;h=d710eb4e5689ae8ee60a66db81a1c17d04ec83c3;hp=9ac5f774eb75a24a23685cb1ff73a2c7c7f3edd6;hb=dd73d57bb95fae31161ca0781108d166082a06f5;hpb=e6142f2e647e83238b1e399b1264e8adb05409f9 diff --git a/src/bin/lttng-sessiond/sessiond-config.c b/src/bin/lttng-sessiond/sessiond-config.c index 9ac5f774e..d710eb4e5 100644 --- a/src/bin/lttng-sessiond/sessiond-config.c +++ b/src/bin/lttng-sessiond/sessiond-config.c @@ -188,10 +188,6 @@ int config_set_paths_root(struct sessiond_config *config) DEFAULT_GLOBAL_APPS_WAIT_SHM_PATH); config_string_set_static(&config->health_unix_sock_path, DEFAULT_GLOBAL_HEALTH_UNIX_SOCK); - config_string_set_static(&config->kconsumerd_err_unix_sock_path, - DEFAULT_KCONSUMERD_ERR_SOCK_PATH); - config_string_set_static(&config->kconsumerd_cmd_unix_sock_path, - DEFAULT_KCONSUMERD_CMD_SOCK_PATH); end: return ret; } @@ -340,6 +336,24 @@ int sessiond_config_init(struct sessiond_config *config) config_string_set(&config->kconsumerd_path, str); str = NULL; + ret = asprintf(&str, DEFAULT_KCONSUMERD_ERR_SOCK_PATH, + config->rundir.value); + if (ret < 0) { + ERR("Failed to set kernel consumer error socket path"); + goto end; + } + config_string_set(&config->kconsumerd_err_unix_sock_path, str); + str = NULL; + + ret = asprintf(&str, DEFAULT_KCONSUMERD_CMD_SOCK_PATH, + config->rundir.value); + if (ret < 0) { + ERR("Failed to set kernel consumer command socket path"); + goto end; + } + config_string_set(&config->kconsumerd_cmd_unix_sock_path, str); + str = NULL; + ret = asprintf(&str, "%s/%s", config->rundir.value, DEFAULT_LTTNG_SESSIOND_PIDFILE); if (ret < 0) {