cluster: STABLE3 - cman_tool: use quiet options for config validation
Fabio M. Di Nitto
fabbione at fedoraproject.org
Fri Oct 2 11:40:54 UTC 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b65a7b4e86c4fb6b52752918090ea3230e27970a
Commit: b65a7b4e86c4fb6b52752918090ea3230e27970a
Parent: 1ad72774e4139fbc7163ae35bbde3fbf41615dc7
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate: Fri Oct 2 13:40:14 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Fri Oct 2 13:40:14 2009 +0200
cman_tool: use quiet options for config validation
and stop passing the config loader info that's already in the environment
Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
cman/cman_tool/main.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c
index 9ba2c6c..3eedfea 100644
--- a/cman/cman_tool/main.c
+++ b/cman/cman_tool/main.c
@@ -649,7 +649,7 @@ static void set_votes(commandline_t *comline)
cman_finish(h);
}
-static int validate_config(commandline_t *comline, char *config_value)
+static int validate_config(commandline_t *comline)
{
struct stat st;
char command[PATH_MAX];
@@ -663,7 +663,7 @@ static int validate_config(commandline_t *comline, char *config_value)
return 0;
}
- snprintf(command, sizeof(command), "%s -C %s", validator, config_value);
+ snprintf(command, sizeof(command), "%s -q", validator);
if (comline->verbose > 1)
printf("calling '%s'\n", command);
@@ -759,7 +759,7 @@ static void version(commandline_t *comline)
if (comline->verbose)
printf("Validating configuration\n");
- if (validate_config(comline, config_modules) &&
+ if (validate_config(comline) &&
comline->config_validate_opt == VALIDATE_FAIL)
die("Not reloading, configuration is not valid\n");
}
@@ -1149,7 +1149,7 @@ static void do_join(commandline_t *comline, char *envp[])
if (comline->verbose)
printf("Validating configuration\n");
- if (validate_config(comline, comline->config_lcrso) &&
+ if (validate_config(comline) &&
comline->config_validate_opt == VALIDATE_FAIL)
die("Not joining, configuration is not valid\n");
}
More information about the cluster-commits
mailing list