andreas/heartbeat
Public Access
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 44 Wiki Activity

syslog lvl err; typos

Browse Source
This commit is contained in:
Andreas Wrede
2016-04-19 22:56:06 -04:00
parent bcf3120833
commit a90c245ad1
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hbc
+12 -12
View File
@@ -47,7 +47,7 @@ class NullDevice:
def syslogtrace(note):
logm = '%s hbc died: \n%s' % (note, traceback.format_exc())
for l in logm.split('\n'):
syslog.syslog(' tb: %s' % l)
syslog.syslog(syslog.LOG_ERR, ' tb: %s' % l)
def getsock(host):
@@ -68,11 +68,11 @@ def getsock(host):
print "dont know this net type: %s" % r[0][0]
sys.exit(1)
if verbose:
syslog.syslog("socktype: %s" % af_type)
syslog.syslog(syslog.LOG_ERR, "socktype: %s" % af_type)
sock=socket.socket(af_type, socket.SOCK_DGRAM)
sock.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR, \
sock.getsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR) | 1)
if verbose: syslog.syslog("get socket %s" % sock)
if verbose: syslog.syslog(syslog.LOG_ERR, "get socket %s" % sock)
socks.append(sock)
return socks
@@ -86,7 +86,7 @@ def socksend(msg, tohost):
for sock in socks:
if DBG: print "socksend: sending msg=%s on socket=%s" % (msg, sock)
sock.sendto(msg, tohost)
if verbose: syslog.syslog("msg %s sent" % msg)
if verbose: syslog.syslog(syslog.LOG_ERR, "msg %s sent" % msg)
def process():
@@ -99,10 +99,10 @@ def process():
lastT=time.time()
ifiles = []
for sock in socks:
ifles.append(sock.fileno())
ifiles.append(sock.fileno())
while up:
sleep=(lastT+interval) - time.time()
if verbose: syslog.syslog("sleep %s" % sleep)
if verbose: syslog.syslog(syslog.LOG_ERR, "sleep %s" % sleep)
if sleep > 0:
try:
r=select.select(ifiles,[],[],sleep)
@@ -110,7 +110,7 @@ def process():
if up:
syslogtrace('select')
break
if verbose: syslog.syslog("r is %s" % str(r))
if verbose: syslog.syslog(syslog.LOG_ERR, "r is %s" % str(r))
cont = False
for sock in socks:
if sock.fileno() in r[0]:
@@ -131,7 +131,7 @@ def process():
for hb_host in hb_hosts:
try:
msg="interval=%s;name=%s;time=%s;acks=%s" % (interval, iam, time.time(), ackcount)
if verbose: syslog.syslog("sock.send('%s', (%s, %s))" % (msg, hb_host, hb_port))
if verbose: syslog.syslog(syslog.LOG_ERR, "sock.send('%s', (%s, %s))" % (msg, hb_host, hb_port))
socksend(msg, (hb_host, hb_port))
except:
logm = '%s hbc died: \n%s' % ('socksend', traceback.format_exc())
@@ -142,10 +142,10 @@ def process():
def cleanup(a, b):
global up, socks, ackcount
up = False
syslog.syslog('exit a=%s b=%s' % (str(a), str(b)))
syslog.syslog(syslog.LOG_ERR, 'exit a=%s b=%s' % (str(a), str(b)))
msg="shutdown=1;name=%s;acks=%s" % (iam, ackcount)
for hb_host in hb_hosts:
if verbose: syslog.syslog("hbc: sock.send('%s', (%s, %s))" % (msg, hb_host, hb_port))
if verbose: syslog.syslog(syslog.LOG_ERR, "hbc: sock.send('%s', (%s, %s))" % (msg, hb_host, hb_port))
socksend(msg, (hb_host, hb_port))
time.sleep(1)
for sock in socks:
@@ -325,11 +325,11 @@ if fdaemon:
# signal.SIGUSR1: reload_program_config,
}
context.files_preseve = []
context.files_preserve = []
for sock in socks:
context.files_preserve += [sock, sock.fileno()]
with context:
syslog.syslog('starting heartbeat to %s' % ','.join(hb_hosts))
syslog.syslog(syslog.LOG_ERR, 'starting heartbeat to %s' % ','.join(hb_hosts))
up = True
try:
process()