|
 |
3d71c6 |
From: Andrew Beekhof <andrew@beekhof.net>
|
|
|
3d71c6 |
Date: Mon, 28 Sep 2015 15:02:10 +1000
|
|
|
3d71c6 |
Subject: [PATCH] Feature: Tools: Do not send command lines to syslog
|
|
|
3d71c6 |
|
|
|
3d71c6 |
(cherry picked from commit 8dae6838312c6a60c2e4b7ffa73a100fd5d0dce3)
|
|
|
3d71c6 |
---
|
|
|
3d71c6 |
lib/common/logging.c | 8 --------
|
|
|
3d71c6 |
1 file changed, 8 deletions(-)
|
|
|
3d71c6 |
|
|
|
3d71c6 |
diff --git a/lib/common/logging.c b/lib/common/logging.c
|
|
|
3d71c6 |
index b18b841..6879023 100644
|
|
|
3d71c6 |
--- a/lib/common/logging.c
|
|
|
3d71c6 |
+++ b/lib/common/logging.c
|
|
|
3d71c6 |
@@ -928,24 +928,17 @@ crm_log_args(int argc, char **argv)
|
|
|
3d71c6 |
{
|
|
|
3d71c6 |
int lpc = 0;
|
|
|
3d71c6 |
int len = 0;
|
|
|
3d71c6 |
- int restore = FALSE;
|
|
|
3d71c6 |
int existing_len = 0;
|
|
|
3d71c6 |
int line = __LINE__;
|
|
|
3d71c6 |
static int logged = 0;
|
|
|
3d71c6 |
|
|
|
3d71c6 |
char *arg_string = NULL;
|
|
|
3d71c6 |
- struct qb_log_callsite *args_cs =
|
|
|
3d71c6 |
- qb_log_callsite_get(__func__, __FILE__, ARGS_FMT, LOG_NOTICE, line, 0);
|
|
|
3d71c6 |
|
|
|
3d71c6 |
if (argc == 0 || argv == NULL || logged) {
|
|
|
3d71c6 |
return;
|
|
|
3d71c6 |
}
|
|
|
3d71c6 |
|
|
|
3d71c6 |
logged = 1;
|
|
|
3d71c6 |
- qb_bit_set(args_cs->targets, QB_LOG_SYSLOG); /* Turn on syslog too */
|
|
|
3d71c6 |
-
|
|
|
3d71c6 |
- restore = qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_STATE_GET, 0);
|
|
|
3d71c6 |
- qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_ENABLED, QB_TRUE);
|
|
|
3d71c6 |
|
|
|
3d71c6 |
for (; lpc < argc; lpc++) {
|
|
|
3d71c6 |
if (argv[lpc] == NULL) {
|
|
|
3d71c6 |
@@ -958,7 +951,6 @@ crm_log_args(int argc, char **argv)
|
|
|
3d71c6 |
}
|
|
|
3d71c6 |
|
|
|
3d71c6 |
qb_log_from_external_source(__func__, __FILE__, ARGS_FMT, LOG_NOTICE, line, 0, arg_string);
|
|
|
3d71c6 |
- qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_ENABLED, restore);
|
|
|
3d71c6 |
|
|
|
3d71c6 |
free(arg_string);
|
|
|
3d71c6 |
}
|