X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Fhealth_check.c;h=deeab67b91b5c07fa698cb65c885261ebc7d4e01;hp=22cbcf12dfaad9ff0db002000ddc717d02c50baa;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hpb=4d6fd6965d3dcff5ae2a157c58873f30dc117c09

diff --git a/tests/regression/tools/health/health_check.c b/tests/regression/tools/health/health_check.c
index 22cbcf12d..deeab67b9 100644
--- a/tests/regression/tools/health/health_check.c
+++ b/tests/regression/tools/health/health_check.c
@@ -1,18 +1,9 @@
 /*
- * 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>
@@ -24,12 +15,16 @@
 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;
@@ -78,7 +73,7 @@ int check_sessiond(void)
 		return -1;
 	}
 
-	status = check_component(lh, "sessiond");
+	status = check_component(lh, "sessiond", 0);
 
 	lttng_health_destroy(lh);
 
@@ -102,7 +97,7 @@ int check_consumerd(enum lttng_health_consumerd hc)
 		return -1;
 	}
 
-	status = check_component(lh, cnames[hc]);
+	status = check_component(lh, cnames[hc], 1);
 
 	lttng_health_destroy(lh);
 
@@ -121,7 +116,7 @@ int check_relayd(const char *path)
 		return -1;
 	}
 
-	status = check_component(lh, "relayd");
+	status = check_component(lh, "relayd", 0);
 
 	lttng_health_destroy(lh);
 
@@ -133,14 +128,12 @@ int main(int argc, char *argv[])
 	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);
 		}
 	}