X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fhealth.c;fp=src%2Fbin%2Flttng-sessiond%2Fhealth.c;h=7fc557da5f8d28164af0cc9129d89768bda9949f;hp=483616ac26a3d7b160b30d691a99a0d8f8bf9164;hb=412d7227e69ec845e44c49082a417f9454d9b55d;hpb=abcdc00cea4a7b354509b3547a8ddd581a9d5dfa diff --git a/src/bin/lttng-sessiond/health.c b/src/bin/lttng-sessiond/health.c index 483616ac2..7fc557da5 100644 --- a/src/bin/lttng-sessiond/health.c +++ b/src/bin/lttng-sessiond/health.c @@ -77,7 +77,7 @@ static void *thread_manage_health(void *data) } /* Create unix socket */ - sock = lttcomm_create_unix_sock(config.health_unix_sock_path.value); + sock = lttcomm_create_unix_sock(the_config.health_unix_sock_path.value); if (sock < 0) { ERR("Unable to create health check Unix socket"); goto error; @@ -87,23 +87,23 @@ static void *thread_manage_health(void *data) /* lttng health client socket path permissions */ gid_t gid; - ret = utils_get_group_id(config.tracing_group_name.value, true, &gid); + ret = utils_get_group_id(the_config.tracing_group_name.value, true, &gid); if (ret) { /* Default to root group. */ gid = 0; } - ret = chown(config.health_unix_sock_path.value, 0, gid); + ret = chown(the_config.health_unix_sock_path.value, 0, gid); if (ret < 0) { - ERR("Unable to set group on %s", config.health_unix_sock_path.value); + ERR("Unable to set group on %s", the_config.health_unix_sock_path.value); PERROR("chown"); goto error; } - ret = chmod(config.health_unix_sock_path.value, + ret = chmod(the_config.health_unix_sock_path.value, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); if (ret < 0) { - ERR("Unable to set permissions on %s", config.health_unix_sock_path.value); + ERR("Unable to set permissions on %s", the_config.health_unix_sock_path.value); PERROR("chmod"); goto error; } @@ -203,7 +203,7 @@ restart: * health_check_state returns 0 if health is * bad. */ - if (!health_check_state(health_sessiond, i)) { + if (!health_check_state(the_health_sessiond, i)) { reply.ret_code |= 1ULL << i; } } @@ -229,7 +229,7 @@ error: ERR("Health error occurred in %s", __func__); } DBG("Health check thread dying"); - unlink(config.health_unix_sock_path.value); + unlink(the_config.health_unix_sock_path.value); if (sock >= 0) { ret = close(sock); if (ret) {