/*
- * Copyright (C) 2012 - Christian Babeux <christian.babeux@efficios.com>
+ * Copyright (C) 2012 Christian Babeux <christian.babeux@efficios.com>
+ * Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <stdio.h>
static const char *relayd_path;
static
-int check_component(struct lttng_health *lh, const char *component_name)
+int check_component(struct lttng_health *lh, const char *component_name,
+ int ok_if_not_running)
{
const struct lttng_health_thread *thread;
int nr_threads, i, status;
if (lttng_health_query(lh)) {
+ if (ok_if_not_running) {
+ return 0;
+ }
fprintf(stderr, "Error querying %s health\n",
component_name);
return -1;
return -1;
}
- status = check_component(lh, "sessiond");
+ status = check_component(lh, "sessiond", 0);
lttng_health_destroy(lh);
return -1;
}
- status = check_component(lh, cnames[hc]);
+ status = check_component(lh, cnames[hc], 1);
lttng_health_destroy(lh);
return -1;
}
- status = check_component(lh, "relayd");
+ status = check_component(lh, "relayd", 0);
lttng_health_destroy(lh);
int status = 0, i;
for (i = 1; i < argc; i++) {
- if (!strcmp(argv[i], "--relayd-path")) {
- if (i >= argc - 1) {
- fprintf(stderr, "Missing relayd path\n");
- exit(EXIT_FAILURE);
- }
- relayd_path = argv[++i];
+ size_t relayd_path_arg_len = strlen("--relayd-path=");
+ if (!strncmp(argv[i], "--relayd-path=",
+ relayd_path_arg_len)) {
+ relayd_path = &argv[i][relayd_path_arg_len];
} else {
- fprintf(stderr, "Unknown option \"%s\". Try --relayd-path PATH.\n", argv[i]);
+ fprintf(stderr, "Unknown option \"%s\". Try --relayd-path=PATH.\n", argv[i]);
exit(EXIT_FAILURE);
}
}