projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: remove relayd rundir on cleanup
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
health-relayd.c
diff --git
a/src/bin/lttng-relayd/health-relayd.c
b/src/bin/lttng-relayd/health-relayd.c
index 61e50367cb0eb1bfeadeb1e549468d180145afa0..2ce1c1fdafa763a180e15d894de041fb55369664 100644
(file)
--- a/
src/bin/lttng-relayd/health-relayd.c
+++ b/
src/bin/lttng-relayd/health-relayd.c
@@
-54,6
+54,8
@@
/* Global health check unix path */
static char health_unix_sock_path[PATH_MAX];
/* Global health check unix path */
static char health_unix_sock_path[PATH_MAX];
+static char *relayd_path;
+static char *lttng_rundir;
int health_quit_pipe[2];
int health_quit_pipe[2];
@@
-133,12
+135,12
@@
static
int setup_health_path(void)
{
int is_root, ret = 0;
int setup_health_path(void)
{
int is_root, ret = 0;
- char *home_path = NULL
, *rundir = NULL, *relayd_path
;
+ char *home_path = NULL;
is_root = !getuid();
if (is_root) {
is_root = !getuid();
if (is_root) {
- rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+
lttng_
rundir = strdup(DEFAULT_LTTNG_RUNDIR);
} else {
/*
* Create rundir from home path. This will create something like
} else {
/*
* Create rundir from home path. This will create something like
@@
-153,20
+155,20
@@
int setup_health_path(void)
goto end;
}
goto end;
}
- ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
+ ret = asprintf(&
lttng_
rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
if (ret < 0) {
ret = -ENOMEM;
goto end;
}
}
if (ret < 0) {
ret = -ENOMEM;
goto end;
}
}
- ret = asprintf(&relayd_path, DEFAULT_RELAYD_PATH, rundir);
+ ret = asprintf(&relayd_path, DEFAULT_RELAYD_PATH,
lttng_
rundir);
if (ret < 0) {
ret = -ENOMEM;
goto end;
}
if (ret < 0) {
ret = -ENOMEM;
goto end;
}
- ret = create_lttng_rundir_with_perm(rundir);
+ ret = create_lttng_rundir_with_perm(
lttng_
rundir);
if (ret < 0) {
goto end;
}
if (ret < 0) {
goto end;
}
@@
-195,7
+197,6
@@
int setup_health_path(void)
}
end:
}
end:
- free(rundir);
return ret;
}
return ret;
}
@@
-378,6
+379,11
@@
error:
}
DBG("Health check thread dying");
unlink(health_unix_sock_path);
}
DBG("Health check thread dying");
unlink(health_unix_sock_path);
+ (void) rmdir(relayd_path);
+ free(relayd_path);
+ (void) rmdir(lttng_rundir);
+ free(lttng_rundir);
+
if (sock >= 0) {
ret = close(sock);
if (ret) {
if (sock >= 0) {
ret = close(sock);
if (ret) {
This page took
0.036693 seconds
and
4
git commands to generate.