static int validate_command_options(void)
{
int ret = CMD_SUCCESS;
+
if (opt_snapshot && opt_live_timer) {
ERR("Snapshot and live modes are mutually exclusive.");
ret = CMD_ERROR;
}
if ((!opt_ctrl_url && opt_data_url) || (opt_ctrl_url && !opt_data_url)) {
- ERR("You need both control and data URL.");
+ ERR("Control and data URLs must both be set.");
ret = CMD_ERROR;
goto error;
}
case OUTPUT_LOCAL:
break;
case OUTPUT_NET:
+ if (!ctrl_url || !data_url) {
+ break;
+ }
+
if (session_type == SESSION_SNAPSHOT) {
ret = add_snapshot_output(session_name, ctrl_url,
data_url);
- } else if (ctrl_url && data_url) {
+ } else {
/*
* Normal sessions and live sessions behave the same way
* regarding consumer url.
strlen(DEFAULT_SESSION_NAME) + 1) == 0) ||
(strncmp(opt_session_name, DEFAULT_SESSION_NAME,
strlen(DEFAULT_SESSION_NAME)) == 0 &&
- strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME))) {
+ strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME))) {
ERR("%s is a reserved keyword for default session(s)",
DEFAULT_SESSION_NAME);
}
} else {
/* Generate a name */
- /* TODO: use asprint */
ret = asprintf(&base_session_name, DEFAULT_SESSION_NAME "-%s", datetime);
if (ret < 0) {
- PERROR("Asprintf generated session name");
+ PERROR("Asprintf session name");
goto error;
}
session_name_date = strdup(base_session_name);
ret = CMD_SUCCESS;
error:
-
/* Session temp stuff */
free(session_name_date);
-
free(uris);
if (ret < 0) {
ERR("%s", lttng_strerror(ret));
}
+
free(base_session_name);
free(base_url);
free(base_ctrl_url);