diff --git a/hbd b/hbd index 35f5f0e..cb76938 100755 --- a/hbd +++ b/hbd @@ -1,5 +1,5 @@ #!/usr/bin/env python -# $Id: hbd,v 1.25 2010/08/21 14:37:53 andreas Exp $ +# $Id: hbd,v 1.26 2010/12/30 03:10:18 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 @@ -415,17 +415,18 @@ class HtmlHandler(SocketServer.BaseRequestHandler): res.append("\n" % 60) res.append("") res.append('') - res.append("

Heartbeat status at %s (%s)

" % (time.strftime("%H:%M:%S", time.localtime(now)), os.environ.get('TZ','Europe/Berlin'))) + res.append("

Heartbeat status

%s (%s)

" % (time.strftime("%H:%M:%S", time.localtime(now)), os.environ.get('TZ','Europe/Berlin'))) res.append("") - res.append("\n" ) + res.append("\n" ) hosts_sorted=hosts.keys() hosts_sorted.sort() for h in hosts_sorted: - res.append("\n" % (h, hosts[h].state, hosts[h].addr, hosts[h].uppercent, time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(hosts[h].statetime)))) + res.append("\n" % (h, hosts[h].state, hosts[h].addr, time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(hosts[h].statetime)))) res.append("
HostStateIP AddrResLast change
HostStateIP AddrLast change
%-24s%-7s%-16s%-3s%-17s
%-24s%-7s%-16s%-17s
") - res.append("

") + res.append("

Log of Events

") for m in msgs[len(msgs)-30:]: res.append("%s
" % m) + res.append("") try: self.request.send(string.join(res,"\n"))