Add Python agent support

[lttng-tools.git] / src / bin / lttng / utils.c

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index b40465b38ebef7d987381ad82a5353524ef57a7a..c518405cae2944c6fd3e6e997f024eed307ad0ff 100644 (file)
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -36,6 +36,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 +276,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 +349,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 +358,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 +375,10 @@ int check_relayd(void)
                ret = 1;
        }
 
-       return ret;
-
 error:
-       return -1;
+       if (close(fd) < 0) {
+               perror("close relayd fd");
+       }
+error_socket:
+       return ret;
 }