X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.c;h=c271cbc6b82b74eec91cba27609e11d383369447;hb=d92d258f48168978efe96ac77393801c887bed81;hp=b40465b38ebef7d987381ad82a5353524ef57a7a;hpb=8960e9cd5adb7e5cdaece135530a457cd65324dc;p=lttng-tools.git

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index b40465b38..c271cbc6b 100644
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -36,14 +36,10 @@
 static const char *str_kernel = "Kernel";
 static const char *str_ust = "UST";
 static const char *str_jul = "JUL";
+static const char *str_log4j = "LOG4J";
 
-/*
- *  get_session_name
- *
- *  Return allocated string with the session name found in the config
- *  directory.
- */
-char *get_session_name(void)
+static
+char *_get_session_name(int quiet)
 {
 	char *path, *session_name = NULL;
 
@@ -54,7 +50,8 @@ char *get_session_name(void)
 	}
 
 	/* Get session name from config */
-	session_name = config_read_session_name(path);
+	session_name = quiet ? config_read_session_name_quiet(path) :
+		config_read_session_name(path);
 	if (session_name == NULL) {
 		goto error;
 	}
@@ -67,6 +64,28 @@ error:
 	return NULL;
 }
 
+/*
+ *  get_session_name
+ *
+ *  Return allocated string with the session name found in the config
+ *  directory.
+ */
+char *get_session_name(void)
+{
+	return _get_session_name(0);
+}
+
+/*
+ *  get_session_name_quiet (no warnings/errors emitted)
+ *
+ *  Return allocated string with the session name found in the config
+ *  directory.
+ */
+char *get_session_name_quiet(void)
+{
+	return _get_session_name(1);
+}
+
 /*
  *  list_commands
  *
@@ -274,6 +293,9 @@ const char *get_domain_str(enum lttng_domain_type domain)
 	case LTTNG_DOMAIN_JUL:
 		str_dom = str_jul;
 		break;
+	case LTTNG_DOMAIN_LOG4J:
+		str_dom = str_log4j;
+		break;
 	default:
 		/* Should not have an unknown domain or else define it. */
 		assert(0);
@@ -341,7 +363,8 @@ int check_relayd(void)
 	fd = socket(AF_INET, SOCK_STREAM, 0);
 	if (fd < 0) {
 		perror("socket check relayd");
-		goto error;
+		ret = -1;
+		goto error_socket;
 	}
 
 	sin.sin_family = AF_INET;
@@ -349,6 +372,7 @@ int check_relayd(void)
 	ret = inet_pton(sin.sin_family, "127.0.0.1", &sin.sin_addr);
 	if (ret < 1) {
 		perror("inet_pton check relayd");
+		ret = -1;
 		goto error;
 	}
 
@@ -365,8 +389,10 @@ int check_relayd(void)
 		ret = 1;
 	}
 
-	return ret;
-
 error:
-	return -1;
+	if (close(fd) < 0) {
+		perror("close relayd fd");
+	}
+error_socket:
+	return ret;
 }