templog: server/ts.py annotate

annotate server/ts.py @ 344:ea1779d27641

- Getting there, update has problems

author	Matt Johnston <matt@ucc.asn.au>
date	Sat, 16 Jun 2012 09:08:07 +0800
parents	3baca8d980f4
children	4bfa9b7b2e4b

rev	line source
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 #!/usr/bin/env python2.7
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	3 BTADDR = "00:12:03:27:70:88"
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	4 SLEEP_TIME = 180
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	5 # time that the bluetooth takes to get going?
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	6 EXTRA_WAKEUP = 0
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	7
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	8 FETCH_TRIES = 3
7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	9
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	10 # avoid turning off the bluetooth etc.
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	11 TESTING = True
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	12
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 import sys
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	14 # for wrt
298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	15 sys.path.append('/root/python')
298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	16 import httplib
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	17 import time
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	18 import traceback
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	19 import binascii
3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	20 import hmac
340 3baca8d980f4 - import zlib Matt Johnston <matt@ucc.asn.au> parents: 338 diff changeset	21 import zlib
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	22
3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	23 import config
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	24
332 05c1249da994 - Move crc16 to utils and fix it Matt Johnston <matt@ucc.asn.au> parents: 331 diff changeset	25 from utils import monotonic_time, retry, readline, crc16
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 lightblue = None
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 try:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 import lightblue
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 except ImportError:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 import bluetooth
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 def get_socket(addr):
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 if lightblue:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 s = lightblue.socket()
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	36 s.connect((addr, 1))
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	37 s.settimeout(3)
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38 else:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39 s = bluetooth.BluetoothSocket( bluetooth.RFCOMM )
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 s.connect((addr, 1))
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	42 s.setblocking(False)
7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	43
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 return s
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	47 @retry()
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 def fetch(sock):
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	49 print "fetch"
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 sock.send("fetch\n")
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 crc = 0
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 lines = []
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 l = readline(sock)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 if l != 'START\n':
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 print>>sys.stderr, "Bad expected START line '%s'\n" % l.rstrip('\n')
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58 return None
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59 crc = crc16(l, crc)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 lines.append(l)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	62 while True:
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 l = readline(sock)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65 crc = crc16(l, crc)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67 if l == 'END\n':
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68 break
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	70 lines.append(l.rstrip('\n'))
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	72 print lines
7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	73
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74 l = readline(sock)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75 recv_crc = None
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76 try:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 k, v = l.rstrip('\n').split('=')
331 5de3fc71ce48 - Make the python work on openwrt Matt Johnston <matt@ucc.asn.au> parents: 330 diff changeset	78 print k,v
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79 if k == 'CRC':
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80 recv_crc = int(v)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81 if recv_crc < 0 or recv_crc > 0xffff:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82 recv_crc = None
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83 except ValueError:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 pass
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86 if recv_crc is None:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 print>>sys.stderr, "Bad expected CRC line '%s'\n" % l.rstrip('\n')
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 return None
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 if recv_crc != crc:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 print>>sys.stderr, "Bad CRC: calculated 0x%x vs received 0x%x\n" % (crc, recv_crc)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 return None
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	94 return lines
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	95
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	96 @retry()
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	97 def turn_off(sock):
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	98 if TESTING:
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	99 return None
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	100 sock.send("btoff\n");
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	101 # read newline
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	102 l = readline(sock)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	103 if not l:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	104 print>>sys.stderr, "Bad response to btoff\n"
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	105 return None
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	106
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	107 off, next_wake = l.rstrip().split(':')
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	108 if off != 'Off':
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	109 print>>sys.stderr, "Bad response to btoff '%s'\n" % l
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	110
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	111 return int(next_wake)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	112
338 12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	113 @retry()
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	114 def clear_meas(sock):
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	115 sock.send("clear\n");
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	116 l = readline(sock)
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	117 if l and l.rstrip() == 'cleared':
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	118 return True
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	119
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	120 print>>sys.stderr, "Bad response to clear %s\n" % str(l)
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	121 return False
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	122
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	123 def send_results(lines):
335 1e22eaf93620 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 334 diff changeset	124 enc_lines = binascii.b2a_base64(zlib.compress('\n'.join(lines)))
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	125 hmac.new(config.HMAC_KEY, enc_lines).hexdigest()
3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	126
3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	127 url_data = urllib.url_encode( ('lines', enc_lines), ('hmac', mac) )
3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	128 con = urllib2.urlopen(config.UPDATE_URL, url_data)
338 12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	129 result = con.read(100)
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	130 if result == 'OK':
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	131 return True
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	132 else:
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	133 print>>sys.stderr, "Bad result '%s'" % result
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	134 return False
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	135
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	136 def do_comms(sock):
331 5de3fc71ce48 - Make the python work on openwrt Matt Johnston <matt@ucc.asn.au> parents: 330 diff changeset	137 print "do_comms"
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	138 d = None
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	139 # serial could be unreliable, try a few times
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	140 for i in range(FETCH_TRIES):
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	141 d = fetch(sock)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	142 if d:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	143 break
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	144 time.sleep(1)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	145 if not d:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	146 return
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	147
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	148 res = send_results(d)
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	149 if not res:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	150 return
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	151
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	152 clear_meas(sock)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	153
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	154 next_wake = turn_off(sock)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	155 sock.close()
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	156 return next_wake
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	157
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	158 testcount = 0
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	159
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	160 def sleep_for(secs):
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	161 until = monotonic_time() + secs
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	162 while True:
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	163 length = until - monotonic_time()
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	164 if length <= 0:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	165 return
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	166 time.sleep(length)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	167
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	168 def main():
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	169
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	170 while True:
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	171 sock = None
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	172 try:
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	173 sock = get_socket(BTADDR)
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	174 except Exception, e:
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	175 print>>sys.stderr, "Error connecting:"
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	176 traceback.print_exc(file=sys.stderr)
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	177 sleep_time = SLEEP_TIME
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	178 if sock:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	179 next_wake = None
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	180 try:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	181 next_wake = do_comms(sock)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	182 except Exception, e:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	183 print>>sys.stderr, "Error in do_comms:"
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	184 traceback.print_exc(file=sys.stderr)
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	185 if next_wake:
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	186 sleep_time = min(next_wake+EXTRA_WAKEUP, sleep_time)
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	187
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	188 if TESTING:
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	189 print "Sleeping for %d" % sleep_time
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	190 sleep_for(sleep_time)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	191
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	192 if __name__ == '__main__':
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	193 main()

Mercurial > templog

annotate server/ts.py @ 344:ea1779d27641