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

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index b40465b38..3cc254a3c 100644
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -36,6 +37,8 @@
 static const char *str_kernel = "Kernel";
 static const char *str_ust = "UST";
 static const char *str_jul = "JUL";
+static const char *str_log4j = "LOG4J";
+static const char *str_python = "Python";
 
 /*
  *  get_session_name
@@ -274,6 +277,12 @@ 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;
+	case LTTNG_DOMAIN_PYTHON:
+		str_dom = str_python;
+		break;
 	default:
 		/* Should not have an unknown domain or else define it. */
 		assert(0);
@@ -341,7 +350,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 +359,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 +376,10 @@ int check_relayd(void)
 		ret = 1;
 	}
 
-	return ret;
-
 error:
-	return -1;
+	if (close(fd) < 0) {
+		perror("close relayd fd");
+	}
+error_socket:
+	return ret;
 }