*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
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
- *
- * 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;
}
/* 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;
}
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
*
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);
if (errno == ENOENT) {
ERR("No relayd found. Use --relayd-path.");
} else {
- perror("execlp");
+ PERROR("execlp");
}
kill(getppid(), SIGTERM); /* wake parent */
exit(EXIT_FAILURE);
} else if (pid > 0) {
goto end;
} else {
- perror("fork");
+ PERROR("fork");
ret = -1;
goto end;
}
fd = socket(AF_INET, SOCK_STREAM, 0);
if (fd < 0) {
- perror("socket check relayd");
- goto error;
+ PERROR("socket check relayd");
+ ret = -1;
+ goto error_socket;
}
sin.sin_family = AF_INET;
sin.sin_port = htons(DEFAULT_NETWORK_VIEWER_PORT);
ret = inet_pton(sin.sin_family, "127.0.0.1", &sin.sin_addr);
if (ret < 1) {
- perror("inet_pton check relayd");
+ PERROR("inet_pton check relayd");
+ ret = -1;
goto error;
}
ret = 1;
}
- return ret;
-
error:
- return -1;
+ if (close(fd) < 0) {
+ PERROR("close relayd fd");
+ }
+error_socket:
+ return ret;
}