display number of acks

hbd

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# $Id: hbd,v 1.28 2012/03/29 00:08:19 andreas Exp $
+# $Id: hbd,v 1.29 2012/03/29 00:16:11 andreas Exp $
 # Wait for heartbeat messages and act on them (or their absence)
 #
 import time, os, string, sys, socket, atexit, select, SocketServer, getopt, signal, cPickle
@@ -68,16 +68,15 @@ class Host:
 	self.state="up"
 	self.statetime=self.lastbeat
 	self.interval=0
-	self.doesack=False
+	self.doesack=""
 	num+=1
 
   def getstate(self):
 	return self.state
 
   def dispstate(self):
-	if self.doesack:
-		return self.state.upper()
-	return self.state
+	if self.doesack != "":
+		return "%s(%s)" % (self.state, self.doesack)
 	return self.state
 
   # set new state, return number of secs in previous state
@@ -306,7 +305,7 @@ def readsock():
 	msg=None
 	interval=0
 	deltaT=0.0
-	acks=False
+	acks=""
 	for pair in pairs:
 		l=string.split(pair,"=")
 		key=l[0]
@@ -332,10 +331,14 @@ def readsock():
 			except:
 				pass
 		elif key == 'acks':
-			acks=True
+			acks=val
 
 	if boot:
-		log("%s booted, deltaT %0.2g sec (%s)" % (name, deltaT,{True: "with acks", False: ''}[acks]))
+		if acks != "":
+			a="(%s)" % acks
+		else:
+			a=""
+		log("%s booted, deltaT %0.2g sec %s" % (name, deltaT,a))
 	if msg:
 		log("%s msg: %s" % (name, msg), service=service)
 	fromaddr(name, addr[0], boot, interval, acks)