sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

ctdb-daemon: Avoid unnecessarily spamming the logs when in test mode

Browse Source 
Logging the logging location to syslog can be useful on production
systems when the configuration goes unexpectedly missing.  However, in
test mode this just adds noise to the logs on the test system.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-10-17 21:24:07 +11:00 committed by Amitay Isaacs
parent 1bbc4fad43
commit c84254d23d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ctdb/server/ctdbd.c
View File

@ -167,7 +167,7 @@ int main(int argc, const char *argv[])
const char *ctdb_base;
struct conf_context *conf;
const char *logging_location;
const char *t;
const char *test_mode;
bool ok;
/*
@ -238,6 +238,8 @@ int main(int argc, const char *argv[])
* Logging setup/options
*/
test_mode = getenv("CTDB_TEST_MODE");
/* Log to stderr (ignoring configuration) when running as interactive */
if (interactive) {
logging_location = "file:";
@ -246,7 +248,7 @@ int main(int argc, const char *argv[])
logging_location = logging_conf_location(conf);
}
if (strcmp(logging_location, "syslog") != 0) {
if (strcmp(logging_location, "syslog") != 0 && test_mode == NULL) {
/* This can help when CTDB logging is misconfigured */
syslog(LOG_DAEMON|LOG_NOTICE,
"CTDB logging to location %s",
@ -363,8 +365,7 @@ int main(int argc, const char *argv[])
* Testing and debug options
*/
t = getenv("CTDB_TEST_MODE");
if (t != NULL) {
if (test_mode != NULL) {
ctdb->do_setsched = false;
ctdb->do_checkpublicip = false;
fast_start = true;