templog: server/ts.py annotate

annotate server/ts.py @ 429:649648020123

log errors too

author	Matt Johnston <matt@ucc.asn.au>
date	Thu, 11 Oct 2012 20:41:52 +0800
parents	1603d0310dd0
children	94330d90f11f

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
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	3 # time that the bluetooth takes to get going?
403 45d96250387c be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 400 diff changeset	4 EXTRA_WAKEUP = -3
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	5
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	6 FETCH_TRIES = 3
7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	7
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	8 # avoid turning off the bluetooth etc.
348 536128b90573 mostly works Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	9 TESTING = False
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	10
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 import sys
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	12 # for wrt
298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	13 sys.path.append('/root/python')
298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	14 import httplib
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	15 import time
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	16 import traceback
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	17 import binascii
3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	18 import hmac
340 3baca8d980f4 - import zlib Matt Johnston <matt@ucc.asn.au> parents: 338 diff changeset	19 import zlib
342 ba9bfcc9c526 - fix mac/urllib to work Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	20 import urllib
ba9bfcc9c526 - fix mac/urllib to work Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	21 import urllib2
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	22 import logging
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	23
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	24 L = logging.info
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	25 W = logging.warning
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	26 E = logging.error
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	27
3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	28 import config
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	29
332 05c1249da994 - Move crc16 to utils and fix it Matt Johnston <matt@ucc.asn.au> parents: 331 diff changeset	30 from utils import monotonic_time, retry, readline, crc16
372 dae8eb26eaa3 dup2 to devnull Matt Johnston <matt@ucc.asn.au> parents: 371 diff changeset	31 import utils
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	33 import bluetooth
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 def get_socket(addr):
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	36 s = bluetooth.BluetoothSocket( bluetooth.RFCOMM )
403 45d96250387c be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 400 diff changeset	37 L("connecting")
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	38 s.connect((addr, 1))
397 f1428cddb882 handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 395 diff changeset	39 s.setblocking(False)
403 45d96250387c be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 400 diff changeset	40 s.settimeout(1)
397 f1428cddb882 handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 395 diff changeset	41
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 return s
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44
418 1603d0310dd0 try to flush Matt Johnston <matt@ucc.asn.au> parents: 416 diff changeset	45 def flush(sock):
429 649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	46 ret = []
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	47 while True:
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	48 l = readline(sock)
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	49 if l:
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	50 ret.append(l)
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	51 else:
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	52 break
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	53 return ret
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	54
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	55 def encode_extra(extra_lines):
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	56 return ['extra%d=%s' % (n, l.strip()) for (n,l) in enumerate(extra_lines)]
418 1603d0310dd0 try to flush Matt Johnston <matt@ucc.asn.au> parents: 416 diff changeset	57
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	58 @retry()
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59 def fetch(sock):
429 649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	60 extra_lines = flush(sock)
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 sock.send("fetch\n")
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 crc = 0
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 lines = []
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66 l = readline(sock)
429 649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	67 if not l:
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	68 return None
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	69
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 if l != 'START\n':
429 649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	71 W("Bad expected START line '%s'\n" % l.rstrip('\n'))
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	72 extra_lines.append(l)
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	73 return encode_extra(extra_lines)
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74 crc = crc16(l, crc)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	76 while True:
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 l = readline(sock)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79 crc = crc16(l, crc)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81 if l == 'END\n':
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82 break
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	84 lines.append(l.rstrip('\n'))
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85
429 649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	86 lines += encode_extra(extra_lines)
649648020123 log errors too Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	87
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	88 for d in lines:
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	89 L("Received: %s" % d)
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	90
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 l = readline(sock)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 recv_crc = None
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93 try:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 k, v = l.rstrip('\n').split('=')
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95 if k == 'CRC':
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96 recv_crc = int(v)
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 if recv_crc < 0 or recv_crc > 0xffff:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 recv_crc = None
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 except ValueError:
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 pass
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 if recv_crc is None:
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	103 W("Bad expected CRC line '%s'\n" % l.rstrip('\n'))
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 return None
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 if recv_crc != crc:
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	107 W("Bad CRC: calculated 0x%x vs received 0x%x\n" % (crc, recv_crc))
327 5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 return None
5639c74f2cbb untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	110 return lines
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	111
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	112 @retry()
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	113 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	114 if TESTING:
348 536128b90573 mostly works Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	115 return 99
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	116 L("Sending btoff")
418 1603d0310dd0 try to flush Matt Johnston <matt@ucc.asn.au> parents: 416 diff changeset	117 flush(sock)
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	118 sock.send("btoff\n");
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	119 # read newline
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	120 l = readline(sock)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	121 if not l:
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	122 W("Bad response to btoff")
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	123 return None
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	124
397 f1428cddb882 handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 395 diff changeset	125 if not l.startswith('next_wake'):
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	126 W("Bad response to btoff '%s'" % l)
348 536128b90573 mostly works Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	127 return None
397 f1428cddb882 handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 395 diff changeset	128 L("Next wake line %s" % l)
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	129
397 f1428cddb882 handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 395 diff changeset	130 toks = dict(v.split('=') for v in l.split(','))
f1428cddb882 handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 395 diff changeset	131
398 c738a52e31e4 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 397 diff changeset	132 rem = int(toks['rem'])
c738a52e31e4 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 397 diff changeset	133 tick_secs = int(toks['tick_secs'])
405 d9b78a1bdd1d fix off-by-one in remainder code Matt Johnston <matt@ucc.asn.au> parents: 400 diff changeset	134 tick_wake = int(toks['tick_wake']) + 1
398 c738a52e31e4 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 397 diff changeset	135 next_wake = int(toks['next_wake'])
c738a52e31e4 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 397 diff changeset	136
c738a52e31e4 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 397 diff changeset	137 rem_secs = float(rem) / tick_wake * tick_secs
c738a52e31e4 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 397 diff changeset	138
c738a52e31e4 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 397 diff changeset	139 next_wake_secs = next_wake - rem_secs
c738a52e31e4 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 397 diff changeset	140 L("next_wake_secs %f\n", next_wake_secs)
c738a52e31e4 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 397 diff changeset	141 return next_wake_secs
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	142
338 12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	143 @retry()
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	144 def clear_meas(sock):
418 1603d0310dd0 try to flush Matt Johnston <matt@ucc.asn.au> parents: 416 diff changeset	145 flush(sock)
338 12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	146 sock.send("clear\n");
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	147 l = readline(sock)
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	148 if l and l.rstrip() == 'cleared':
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	149 return True
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	150
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	151 E("Bad response to clear '%s'" % str(l))
338 12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	152 return False
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	153
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	154 def send_results(lines):
335 1e22eaf93620 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 334 diff changeset	155 enc_lines = binascii.b2a_base64(zlib.compress('\n'.join(lines)))
342 ba9bfcc9c526 - fix mac/urllib to work Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	156 mac = hmac.new(config.HMAC_KEY, enc_lines).hexdigest()
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	157
342 ba9bfcc9c526 - fix mac/urllib to work Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	158 url_data = urllib.urlencode( {'lines': enc_lines, 'hmac': mac} )
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	159 con = urllib2.urlopen(config.UPDATE_URL, url_data)
338 12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	160 result = con.read(100)
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	161 if result == 'OK':
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	162 return True
12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	163 else:
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	164 W("Bad result '%s'" % result)
338 12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 335 diff changeset	165 return False
334 3b821541657d hmac Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	166
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	167 def do_comms(sock):
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	168 L("do_comms")
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	169 d = None
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	170 # serial could be unreliable, try a few times
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	171 d = fetch(sock)
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	172 if not d:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	173 return
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	174
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	175 res = send_results(d)
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	176 if not res:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	177 return
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	178
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	179 clear_meas(sock)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	180
416 99ef51dd1f61 stay on Matt Johnston <matt@ucc.asn.au> parents: 406 diff changeset	181 next_wake = 600
99ef51dd1f61 stay on Matt Johnston <matt@ucc.asn.au> parents: 406 diff changeset	182 #next_wake = turn_off(sock)
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	183 sock.close()
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	184 return next_wake
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	185
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	186 testcount = 0
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	187
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	188 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	189 until = monotonic_time() + secs
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	190 while True:
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 329 diff changeset	191 length = until - monotonic_time()
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	192 if length <= 0:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	193 return
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	194 time.sleep(length)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	195
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	196 def setup_logging():
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	197 logging.basicConfig(format='%(asctime)s %(message)s',
397 f1428cddb882 handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 395 diff changeset	198 datefmt='%m/%d/%Y %I:%M:%S %p',
f1428cddb882 handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 395 diff changeset	199 level=logging.INFO)
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	200
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	201 def main():
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	202 setup_logging()
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	203
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	204 L("Running templog rfcomm server")
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	205
371 7dec59b7eeef cheap_daemon() Matt Johnston <matt@ucc.asn.au> parents: 353 diff changeset	206 if '--daemon' in sys.argv:
7dec59b7eeef cheap_daemon() Matt Johnston <matt@ucc.asn.au> parents: 353 diff changeset	207 utils.cheap_daemon()
7dec59b7eeef cheap_daemon() Matt Johnston <matt@ucc.asn.au> parents: 353 diff changeset	208
403 45d96250387c be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 400 diff changeset	209 next_wake_time = 0
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	210 while True:
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	211 sock = None
740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	212 try:
388 b33045e7e08e move server config into config.py Matt Johnston <matt@ucc.asn.au> parents: 372 diff changeset	213 sock = get_socket(config.BTADDR)
329 740438e21ea0 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	214 except Exception, e:
400 1137f315209b use the remainder of times Matt Johnston <matt@ucc.asn.au> parents: 398 diff changeset	215 #logging.exception("Error connecting")
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	216 pass
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	217 if sock:
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	218 try:
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	219 avr_wake = do_comms(sock)
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	220 next_wake_time = time.time() + avr_wake
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	221 except Exception, e:
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	222 logging.exception("Error in do_comms")
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	223
403 45d96250387c be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 400 diff changeset	224 next_wake_interval = next_wake_time - time.time() + EXTRA_WAKEUP
395 f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	225 sleep_time = config.SLEEP_TIME
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	226 if next_wake_interval > 0:
f0ddb75bcf04 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 388 diff changeset	227 sleep_time = min(next_wake_interval, sleep_time)
403 45d96250387c be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 400 diff changeset	228 if next_wake_interval < 0 and next_wake_interval > -30:
45d96250387c be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 400 diff changeset	229 L("not sleeping, next_wake_interval overdue %f" % next_wake_interval)
45d96250387c be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 400 diff changeset	230 continue
45d96250387c be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 400 diff changeset	231 L("Sleeping for %d, next wake interval %f" % (sleep_time, next_wake_interval))
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	232 sleep_for(sleep_time)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	233
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	234 if __name__ == '__main__':
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 327 diff changeset	235 main()

Mercurial > templog

annotate server/ts.py @ 429:649648020123