From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 6 Jun 2007 01:13:24 +0000 (+1000)
Subject: - fixed flags display in logs
X-Git-Tag: tevent-0.9.20~348^2~2555
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cafddf76dc4c03338feb8bfe2f3f982511f16223;p=thirdparty%2Fsamba.git

- fixed flags display in logs
- added monitor handler to test event script

(This used to be ctdb commit a4c18dddee169df49e5d77d9a94ce9329f169319)
---

diff --git a/ctdb/common/ctdb_recoverd.c b/ctdb/common/ctdb_recoverd.c
index 20dc349bc5b..9adbe5fbcf6 100644
--- a/ctdb/common/ctdb_recoverd.c
+++ b/ctdb/common/ctdb_recoverd.c
@@ -991,8 +991,7 @@ static void monitor_handler(struct ctdb_context *ctdb, uint64_t srvid,
 		return;
 	}
 
-	DEBUG(0,("Node %u has changed flags - was 0x%x now 0x%x\n", 
-		 c->vnn, nodemap->nodes[i].flags, c->flags));
+	DEBUG(0,("Node %u has changed flags - now 0x%x\n", c->vnn, c->flags));
 
 	nodemap->nodes[i].flags = c->flags;
 	
diff --git a/ctdb/tests/events b/ctdb/tests/events
index 00b0e49a212..70df49a34e1 100755
--- a/ctdb/tests/events
+++ b/ctdb/tests/events
@@ -5,6 +5,10 @@ cmd="$1"
 shift
 
 case $cmd in 
+    monitor)
+	echo "`date` monitor event"
+	exit 0
+	;;
      startup)
 	echo "`date` ctdb startup event"
 	exit 0;