summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2013-01-10 14:39:09 +1100
committerAmitay Isaacs <amitay@gmail.com>2013-02-05 16:03:41 +1100
commita0c88ec816cb364717b16d01db03572c31b9cc1c (patch)
tree2b9f1b64f57fcfb2666e04b213c64f3c3efc80e6
parent11c75419cd1da2573fcd166c2a67cd0de085f168 (diff)
downloadsamba-a0c88ec816cb364717b16d01db03572c31b9cc1c.tar.gz
samba-a0c88ec816cb364717b16d01db03572c31b9cc1c.tar.xz
samba-a0c88ec816cb364717b16d01db03572c31b9cc1c.zip
ctdbd: Message logged at exit should be different for different processes
Some subprocesses print "CTDB daemon shutting down" when they exit and this can be confusing. Signed-off-by: Martin Schwenke <martin@meltin.net> Pair-programmed-with: Amitay Isaacs <amitay@gmail.com> (This used to be ctdb commit f1ffe1112b7e342d7f1228ca816a8e5918f893cf)
-rw-r--r--ctdb/server/ctdb_daemon.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index fdfd5dee77..0550fabf93 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -40,7 +40,11 @@ static void daemon_incoming_packet(void *, struct ctdb_req_header *);
static void print_exit_message(void)
{
- DEBUG(DEBUG_NOTICE,("CTDB daemon shutting down\n"));
+ if (debug_extra != NULL && debug_extra[0] != '\0') {
+ DEBUG(DEBUG_NOTICE,("CTDB %s shutting down\n", debug_extra));
+ } else {
+ DEBUG(DEBUG_NOTICE,("CTDB daemon shutting down\n"));
+ }
}