#include <sys/mman.h>
#include <assert.h>
#include <urcu/compiler.h>
-#include <ulimit.h>
#include <inttypes.h>
#include <common/defaults.h>
#include <common/common.h>
-#include <common/consumer.h>
-#include <common/consumer-timer.h>
+#include <common/consumer/consumer.h>
+#include <common/consumer/consumer-timer.h>
#include <common/compat/poll.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/utils.h>
int is_root = !getuid();
if (is_root) {
- ret = chown(rundir, 0,
- utils_get_group_id(tracing_group_name));
+ gid_t gid;
+
+ ret = utils_get_group_id(tracing_group_name, true, &gid);
+ if (ret) {
+ /* Default to root group. */
+ gid = 0;
+ }
+
+ ret = chown(rundir, 0, gid);
if (ret < 0) {
ERR("Unable to set group on %s", rundir);
PERROR("chown");
}
snprintf(health_unix_sock_path, sizeof(health_unix_sock_path),
DEFAULT_GLOBAL_RELAY_HEALTH_UNIX_SOCK,
- getpid());
+ (int) getpid());
} else {
/* Set health check Unix path */
if (strlen(health_unix_sock_path) != 0) {
snprintf(health_unix_sock_path, sizeof(health_unix_sock_path),
DEFAULT_HOME_RELAY_HEALTH_UNIX_SOCK,
- home_path, getpid());
+ home_path, (int) getpid());
}
end:
sock = lttcomm_create_unix_sock(health_unix_sock_path);
if (sock < 0) {
ERR("Unable to create health check Unix socket");
- ret = -1;
+ err = -1;
goto error;
}
is_root = !getuid();
if (is_root) {
/* lttng health client socket path permissions */
- ret = chown(health_unix_sock_path, 0,
- utils_get_group_id(tracing_group_name));
+ gid_t gid;
+
+ ret = utils_get_group_id(tracing_group_name, true, &gid);
+ if (ret) {
+ /* Default to root group. */
+ gid = 0;
+ }
+
+ ret = chown(health_unix_sock_path, 0, gid);
if (ret < 0) {
ERR("Unable to set group on %s", health_unix_sock_path);
PERROR("chown");
- ret = -1;
+ err = -1;
goto error;
}
if (ret < 0) {
ERR("Unable to set permissions on %s", health_unix_sock_path);
PERROR("chmod");
- ret = -1;
+ err = -1;
goto error;
}
}
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
- if (!revents) {
- /* No activity for this FD (poll implementation). */
- continue;
- }
-
/* Thread quit pipe has been closed. Killing thread. */
ret = check_health_quit_pipe(pollfd, revents);
if (ret) {
new_sock = -1;
}
-exit:
error:
+ lttng_relay_stop_threads();
+exit:
if (err) {
ERR("Health error occurred in %s", __func__);
}