X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=98738928464290a8b1406bf21be06e54c26c9b68;hb=d686b40f66ea5df5ac0b9405991bbc33348b0a88;hp=e7ad6f9b140e1c48f05f2befcda5d73fc1ce2803;hpb=f7776ea71b15b00b5f83b9876ccba9f6ede8e2b4;p=lttng-tools.git

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index e7ad6f9b1..987389284 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -35,7 +35,6 @@
 #include <unistd.h>
 
 #include <urcu/list.h>		/* URCU list library (-lurcu) */
-#include <ust/ustctl.h>		/* UST control lib (-lust) */
 #include <lttng/lttng.h>
 
 #include "liblttsessiondcomm.h"
@@ -46,6 +45,7 @@
 #include "session.h"
 #include "traceable-app.h"
 #include "lttng-kconsumerd.h"
+#include "libustctl.h"
 
 /*
  * TODO:
@@ -224,7 +224,7 @@ static int ust_connect_app(pid_t pid)
 
 	sock = ustctl_connect_pid(lta->pid);
 	if (sock < 0) {
-		ERR("Fail connecting to the PID %d\n", pid);
+		ERR("Fail connecting to the PID %d", pid);
 	}
 
 	return sock;
@@ -637,9 +637,11 @@ static int create_trace_dir(struct ltt_kernel_session *session)
 		// TODO: recursive create dir
 		ret = mkdir(chan->pathname, S_IRWXU | S_IRWXG );
 		if (ret < 0) {
-			perror("mkdir trace path");
-			ret = -errno;
-			goto error;
+			if (ret != EEXIST) {
+				perror("mkdir trace path");
+				ret = -errno;
+				goto error;
+			}
 		}
 	}
 
@@ -1514,8 +1516,11 @@ static int set_kconsumerd_sockets(void)
 
 	ret = mkdir(KCONSUMERD_PATH, S_IRWXU | S_IRWXG);
 	if (ret < 0) {
-		ERR("Failed to create " KCONSUMERD_PATH);
-		goto error;
+		if (errno != EEXIST) {
+			ERR("Failed to create " KCONSUMERD_PATH);
+			goto error;
+		}
+		ret = 0;
 	}
 
 	/* Create the kconsumerd error unix socket */