bump version, don't trap SIGTERM

This commit is contained in:
2016-01-11 03:45:48 +01:00
parent 6929777ac6
commit ce489af512
+4 -3
View File
@@ -492,9 +492,10 @@ class HttpHandler(BaseHTTPServer.BaseHTTPRequestHandler):
res.append('<body BGCOLOR = "#FFFFFF" LINK = "#008000" VLINK = "#008000">')
return res
def buildpage(self):
res=self.buildhead(refresh=60)
res.append("<H2>Heartbeat status</h2><h4> %s (%s)</H4>" % (time.strftime("%H:%M:%S", time.localtime(now)), os.environ.get('TZ', 'CET-1CDT')))
res.append("<H2>Heartbeat status %s</h2><h4> %s (%s)</H4>" % (VER, time.strftime("%H:%M:%S", time.localtime(now)), os.environ.get('TZ', 'CET-1CDT')))
res.append("<table>")
res.append("<tr><th>Host</th><th>State</th><th>Hr</th><th>Dy</th><th>Wk</th><th>IP Addr</th><th>Last change</th></tr>\n")
hosts_sorted = hosts.keys()
@@ -652,7 +653,7 @@ def closeup():
except:
pass
signal.signal(signal.SIGTERM, 0)
# signal.signal(signal.SIGTERM, 0)
signal.signal(signal.SIGHUP, 0)
@@ -860,7 +861,7 @@ if not forground:
running = True
sig = 0
signal.signal(signal.SIGTERM, handler)
#signal.signal(signal.SIGTERM, handler)
signal.signal(signal.SIGHUP, handler)
next = int(now)+15 # 15 seconds time to settle after (re-)start