From: David Goulet <dgoulet@efficios.com>
Date: Tue, 14 Feb 2012 20:33:20 +0000 (-0500)
Subject: Fix existing session daemon check
X-Git-Tag: v2.0-pre23~9
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b09c7c76bc6f409ed9c303c81cba168234700568;p=lttng-tools.git

Fix existing session daemon check

On unclean exit, the session daemon socket are not removed making the
access() test valid on the next session daemon execution and failing to
recover from a fatal error.

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index bf2085000..8e794bdf4 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -3899,17 +3899,12 @@ end:
  */
 static int check_existing_daemon(void)
 {
-	if (access(client_unix_sock_path, F_OK) < 0 &&
-			access(apps_unix_sock_path, F_OK) < 0) {
-		return 0;
-	}
-
 	/* Is there anybody out there ? */
 	if (lttng_session_daemon_alive()) {
 		return -EEXIST;
-	} else {
-		return 0;
 	}
+
+	return 0;
 }
 
 /*