[SCM] CTDB repository - branch master updated - ctdb-2.1-15-gf1ffe11

[Amitay Isaacs]

The branch, master has been updated
       via  f1ffe1112b7e342d7f1228ca816a8e5918f893cf (commit)
      from  35da9a7c2a0f5e54e61588c3c3455f06ebc66822 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f1ffe1112b7e342d7f1228ca816a8e5918f893cf
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Jan 10 14:39:09 2013 +1100

    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 at meltin.net>
    Pair-programmed-with: Amitay Isaacs <amitay at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 server/ctdb_daemon.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
index fdfd5de..0550fab 100644
--- a/server/ctdb_daemon.c
+++ b/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"));
+	}
 }
 
 


-- 
CTDB repository