|
 |
60de42 |
From 6e1d73f3e88f60b21173bb1129b6c0508a0c0268 Mon Sep 17 00:00:00 2001
|
|
|
60de42 |
From: Jehan-Guillaume de Rorthais <jgdr@dalibo.com>
|
|
|
60de42 |
Date: Fri, 10 Mar 2017 15:17:44 +0100
|
|
|
60de42 |
Subject: [PATCH] Low: tools: disable agent stdout/stderr for crm_resource
|
|
|
60de42 |
--validate
|
|
|
60de42 |
|
|
|
60de42 |
Argument --verbose is required to show the stderr/stdout output of the
|
|
|
60de42 |
command.
|
|
|
60de42 |
---
|
|
|
60de42 |
tools/crm_resource_runtime.c | 5 +++++
|
|
|
60de42 |
1 file changed, 5 insertions(+)
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
|
|
|
60de42 |
index ca38aea..5414b94 100644
|
|
|
60de42 |
--- a/tools/crm_resource_runtime.c
|
|
|
60de42 |
+++ b/tools/crm_resource_runtime.c
|
|
|
60de42 |
@@ -1552,6 +1552,10 @@ cli_resource_execute(const char *rsc_id, const char *rsc_action, GHashTable *ove
|
|
|
60de42 |
action, rsc->id, rclass, rprov ? rprov : "", rtype, op->status);
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
+ /* hide output for validate-all if not in verbose */
|
|
|
60de42 |
+ if (!do_trace && safe_str_eq(action, "validate-all"))
|
|
|
60de42 |
+ goto done;
|
|
|
60de42 |
+
|
|
|
60de42 |
if (op->stdout_data) {
|
|
|
60de42 |
local_copy = strdup(op->stdout_data);
|
|
|
60de42 |
more = strlen(local_copy);
|
|
|
60de42 |
@@ -1581,6 +1585,7 @@ cli_resource_execute(const char *rsc_id, const char *rsc_action, GHashTable *ove
|
|
|
60de42 |
free(local_copy);
|
|
|
60de42 |
}
|
|
|
60de42 |
}
|
|
|
60de42 |
+ done:
|
|
|
60de42 |
rc = op->rc;
|
|
|
60de42 |
services_action_free(op);
|
|
|
60de42 |
return rc;
|
|
|
60de42 |
--
|
|
|
60de42 |
1.8.3.1
|
|
|
60de42 |
|