neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Slaughtered all the stuff I asked Curt to add

This commit is contained in:
Neale Pickett 2009-10-08 17:07:15 -06:00
parent 811141e4d9
commit d1baa77f2a
1 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pollster/pollster.py
View File

@ -6,8 +6,6 @@ import sys
import time import time
import socket import socket
import traceback import traceback
import threading
import queue
from ctf import config from ctf import config
from ctf import pointscli from ctf import pointscli
@ -18,25 +16,6 @@ IP_DIR = config.get('pollster', 'heartbeat_dir')
REPORT_PATH = config.get('pollster', 'results') REPORT_PATH = config.get('pollster', 'results')
SOCK_TIMEOUT = config.get('pollster', 'poll_timeout') SOCK_TIMEOUT = config.get('pollster', 'poll_timeout')
class PointSubmitter(threading.Thread):
''' Pulls point allocations from the queue and submits them. '''
def __init__(self, point_queue):
threading.Thread.__init__(self)
self.point_queue = point_queue
self.sock = pointscli.makesock('localhost')
def run(self):
# loop forever
while(True):
cat, team, score = self.point_queue.get()
if None in [cat, team, score]:
continue
try:
pointscli.submit(cat, team, score, sock=self.sock)
except ValueError:
print('pollster: error submitting score (%s, %s, %d)' % (cat, team, score))
traceback.print_exc()
def socket_poll(ip, port, msg, prot, max_recv=1): def socket_poll(ip, port, msg, prot, max_recv=1):
''' Connect via socket to the specified <ip>:<port> using the ''' Connect via socket to the specified <ip>:<port> using the
@ -147,7 +126,7 @@ def poll_tftpd(ip):
resp = resp.split(b'\n')[0] resp = resp.split(b'\n')[0]
# ack # ack
resp = socket_poll(ip, 69, b'\x00\x04' + resp[2:4], socket.SOCK_DGRAM, 0) _ = socket_poll(ip, 69, b'\x00\x04' + resp[2:4], socket.SOCK_DGRAM, 0)
return resp[4:].strip(b'\r\n') return resp[4:].strip(b'\r\n')
@ -161,11 +140,6 @@ POLLS = {
ip_re = re.compile('(\d{1,3}\.){3}\d{1,3}') ip_re = re.compile('(\d{1,3}\.){3}\d{1,3}')
# start point submitter thread
point_queue = queue.Queue()
t = PointSubmitter(point_queue)
t.start()
# loop forever # loop forever
while True: while True:
@ -213,7 +187,7 @@ while True:
# perform polls # perform polls
for service,func in POLLS.items(): for service,func in POLLS.items():
team = str(func(ip)) team = func(ip).decode('utf-8')
if team is None: if team is None:
team = 'dirtbags' team = 'dirtbags'
@ -223,7 +197,7 @@ while True:
if out is not None: if out is not None:
out.write('<tr><td>%s</td><td>%s</td>\n' % (service, team)) out.write('<tr><td>%s</td><td>%s</td>\n' % (service, team))
point_queue.put((service, team, 1)) pointscli.submit(service, team, 1)
if out is not None: if out is not None:
out.write('</table>\n') out.write('</table>\n')