X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=0ab3ad9a73300221092babcbbd3671ea8b5983b5;hp=cdeb009118f37c6fe0f573d952454e145addd71f;hb=5c9408af9daa0f6e17911397019edb5981bc78c9;hpb=d65106b1011efccf8fa5f9d7c8f2dfb0de38f5e8

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index cdeb00911..0ab3ad9a7 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -48,6 +48,7 @@
 #include "traceable-app.h"
 #include "lttng-kconsumerd.h"
 #include "libustctl.h"
+#include "utils.h"
 
 /*
  * TODO:
@@ -282,12 +283,10 @@ static int create_trace_dir(struct ltt_kernel_session *session)
 	/* Create all channel directories */
 	cds_list_for_each_entry(chan, &session->channel_list.head, list) {
 		DBG("Creating trace directory at %s", chan->pathname);
-		// TODO: recursive create dir
-		ret = mkdir(chan->pathname, S_IRWXU | S_IRWXG );
+		ret = mkdir_recursive(chan->pathname, S_IRWXU | S_IRWXG );
 		if (ret < 0) {
 			if (ret != EEXIST) {
-				perror("mkdir trace path");
-				ret = -errno;
+				ERR("Trace directory creation error");
 				goto error;
 			}
 		}
@@ -720,6 +719,7 @@ static struct lttng_channel *init_default_channel(void)
 	chan->attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM;
 	chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
 	chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+	chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
 
 error:
 	return chan;
@@ -751,7 +751,7 @@ static int create_kernel_session(struct ltt_session *session)
 
 	DBG("Creating default kernel channel %s", DEFAULT_CHANNEL_NAME);
 
-	ret = kernel_create_channel(session->kernel_session, chan);
+	ret = kernel_create_channel(session->kernel_session, chan, session->path);
 	if (ret < 0) {
 		ret = LTTCOMM_KERN_CHAN_FAIL;
 		goto error;
@@ -943,7 +943,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		DBG("Creating kernel channel");
 
 		ret = kernel_create_channel(cmd_ctx->session->kernel_session,
-				&cmd_ctx->lsm->u.channel.chan);
+				&cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path);
 		if (ret < 0) {
 			ret = LTTCOMM_KERN_CHAN_FAIL;
 			goto error;
@@ -1166,7 +1166,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 				ret = kernel_create_event(&ev_attr, chan);
 				if (ret < 0) {
 					/* Ignore error here and continue */
-					continue;
 				}
 			}
 
@@ -1226,7 +1225,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		if (cmd_ctx->session->kernel_session != NULL) {
 			if (cmd_ctx->session->kernel_session->metadata == NULL) {
 				DBG("Open kernel metadata");
-				ret = kernel_open_metadata(cmd_ctx->session->kernel_session);
+				ret = kernel_open_metadata(cmd_ctx->session->kernel_session,
+						cmd_ctx->session->path);
 				if (ret < 0) {
 					ret = LTTCOMM_KERN_META_FAIL;
 					goto error;
@@ -1755,32 +1755,13 @@ static int check_existing_daemon()
 	return ret;
 }
 
-/*
- *  get_home_dir
- *
- *  Return pointer to home directory path using
- *  the env variable HOME.
- *
- *  Default : /tmp
- */
-static const char *get_home_dir(void)
-{
-	const char *home_path;
-
-	if ((home_path = (const char *) getenv("HOME")) == NULL) {
-		home_path = default_home_dir;
-	}
-
-	return home_path;
-}
-
 /*
  *  set_permissions
  *
  *  Set the tracing group gid onto the client socket.
  *
  *  Race window between mkdir and chown is OK because we are going from
- *  less permissive (root.root) to more permissive (root.tracing).
+ *  more permissive (root.root) to les permissive (root.tracing).
  */
 static int set_permissions(void)
 {
@@ -1793,8 +1774,13 @@ static int set_permissions(void)
 		(grp = getgrnam(default_tracing_group));
 
 	if (grp == NULL) {
-		ERR("Missing tracing group. Aborting execution.\n");
-		ret = -1;
+		if (is_root) {
+			WARN("No tracing group detected");
+			ret = 0;
+		} else {
+			ERR("Missing tracing group. Aborting execution.");
+			ret = -1;
+		}
 		goto end;
 	}
 
@@ -1989,6 +1975,7 @@ int main(int argc, char **argv)
 {
 	int ret = 0;
 	void *status;
+	const char *home_path;
 
 	/* Parse arguments */
 	progname = argv[0];
@@ -2036,15 +2023,22 @@ int main(int argc, char **argv)
 		/* Set ulimit for open files */
 		set_ulimit();
 	} else {
+		home_path = get_home_dir();
+		if (home_path == NULL) {
+			ERR("Can't get HOME directory for sockets creation.\n \
+				 Please specify --socket PATH.");
+			goto error;
+		}
+
 		if (strlen(apps_unix_sock_path) == 0) {
 			snprintf(apps_unix_sock_path, PATH_MAX,
-					DEFAULT_HOME_APPS_UNIX_SOCK, get_home_dir());
+					DEFAULT_HOME_APPS_UNIX_SOCK, home_path);
 		}
 
 		/* Set the cli tool unix socket path */
 		if (strlen(client_unix_sock_path) == 0) {
 			snprintf(client_unix_sock_path, PATH_MAX,
-					DEFAULT_HOME_CLIENT_UNIX_SOCK, get_home_dir());
+					DEFAULT_HOME_CLIENT_UNIX_SOCK, home_path);
 		}
 	}