templog: server/ts.py annotate

annotate server/ts.py @ 125:397ac5c079bf

avoid bad values

author	Matt Johnston <matt@ucc.asn.au>
date	Wed, 10 Oct 2012 22:58:35 +0800
parents	81591bdfa92c
children	de950be796dd

rev	line source
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 #!/usr/bin/env python2.7
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2
23 b5925cb4f264 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	3 # time that the bluetooth takes to get going?
96 b2d0887fb306 be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	4 EXTRA_WAKEUP = -3
23 b5925cb4f264 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	5
24 44c5ab5ea879 - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 23 diff changeset	6 FETCH_TRIES = 3
44c5ab5ea879 - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 23 diff changeset	7
23 b5925cb4f264 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	8 # avoid turning off the bluetooth etc.
42 26c8ab2ba3f1 mostly works Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	9 TESTING = False
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	10
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 import sys
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	12 # for wrt
dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	13 sys.path.append('/root/python')
dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	14 import httplib
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	15 import time
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	16 import traceback
28 e3e0ed7758f9 hmac Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	17 import binascii
e3e0ed7758f9 hmac Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	18 import hmac
34 79124d7d3f79 - import zlib Matt Johnston <matt@ucc.asn.au> parents: 32 diff changeset	19 import zlib
35 4bfa9b7b2e4b - fix mac/urllib to work Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	20 import urllib
4bfa9b7b2e4b - fix mac/urllib to work Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	21 import urllib2
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	22 import logging
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	23
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	24 L = logging.info
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	25 W = logging.warning
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	26 E = logging.error
28 e3e0ed7758f9 hmac Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	27
e3e0ed7758f9 hmac Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	28 import config
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	29
26 d3e5934fe55c - Move crc16 to utils and fix it Matt Johnston <matt@ucc.asn.au> parents: 25 diff changeset	30 from utils import monotonic_time, retry, readline, crc16
66 c5ad12670cae dup2 to devnull Matt Johnston <matt@ucc.asn.au> parents: 65 diff changeset	31 import utils
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	33 import bluetooth
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 def get_socket(addr):
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	36 s = bluetooth.BluetoothSocket( bluetooth.RFCOMM )
96 b2d0887fb306 be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	37 L("connecting")
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	38 s.connect((addr, 1))
91 231662c6690c handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 89 diff changeset	39 s.setblocking(False)
96 b2d0887fb306 be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	40 s.settimeout(1)
91 231662c6690c handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 89 diff changeset	41
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 return s
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44
119 81591bdfa92c try to flush Matt Johnston <matt@ucc.asn.au> parents: 117 diff changeset	45 def flush(sock):
81591bdfa92c try to flush Matt Johnston <matt@ucc.asn.au> parents: 117 diff changeset	46 while readline(sock):
81591bdfa92c try to flush Matt Johnston <matt@ucc.asn.au> parents: 117 diff changeset	47 pass
81591bdfa92c try to flush Matt Johnston <matt@ucc.asn.au> parents: 117 diff changeset	48
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	49 @retry()
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 def fetch(sock):
119 81591bdfa92c try to flush Matt Johnston <matt@ucc.asn.au> parents: 117 diff changeset	51 flush(sock)
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 sock.send("fetch\n")
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 crc = 0
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 lines = []
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 l = readline(sock)
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58 if l != 'START\n':
96 b2d0887fb306 be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	59 W("Bad expected START line '%s'\n" % str(l).rstrip('\n'))
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 return None
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 crc = crc16(l, crc)
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62
24 44c5ab5ea879 - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 23 diff changeset	63 while True:
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 l = readline(sock)
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66 crc = crc16(l, crc)
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68 if l == 'END\n':
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69 break
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	71 lines.append(l.rstrip('\n'))
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	73 for d in lines:
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	74 L("Received: %s" % d)
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	75
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76 l = readline(sock)
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 recv_crc = None
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 try:
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79 k, v = l.rstrip('\n').split('=')
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80 if k == 'CRC':
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81 recv_crc = int(v)
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82 if recv_crc < 0 or recv_crc > 0xffff:
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83 recv_crc = None
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 except ValueError:
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 pass
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 if recv_crc is None:
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	88 W("Bad expected CRC line '%s'\n" % l.rstrip('\n'))
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89 return None
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 if recv_crc != crc:
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	92 W("Bad CRC: calculated 0x%x vs received 0x%x\n" % (crc, recv_crc))
21 2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93 return None
2029633912c2 untested simple server proxy code Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	95 return lines
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	96
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	97 @retry()
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	98 def turn_off(sock):
23 b5925cb4f264 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	99 if TESTING:
42 26c8ab2ba3f1 mostly works Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	100 return 99
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	101 L("Sending btoff")
119 81591bdfa92c try to flush Matt Johnston <matt@ucc.asn.au> parents: 117 diff changeset	102 flush(sock)
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	103 sock.send("btoff\n");
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	104 # read newline
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	105 l = readline(sock)
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	106 if not l:
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	107 W("Bad response to btoff")
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	108 return None
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	109
91 231662c6690c handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 89 diff changeset	110 if not l.startswith('next_wake'):
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	111 W("Bad response to btoff '%s'" % l)
42 26c8ab2ba3f1 mostly works Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	112 return None
91 231662c6690c handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 89 diff changeset	113 L("Next wake line %s" % l)
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	114
91 231662c6690c handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 89 diff changeset	115 toks = dict(v.split('=') for v in l.split(','))
231662c6690c handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 89 diff changeset	116
92 c3eb67cd8b61 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	117 rem = int(toks['rem'])
c3eb67cd8b61 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	118 tick_secs = int(toks['tick_secs'])
99 1a88bb989afb fix off-by-one in remainder code Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	119 tick_wake = int(toks['tick_wake']) + 1
92 c3eb67cd8b61 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	120 next_wake = int(toks['next_wake'])
c3eb67cd8b61 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	121
c3eb67cd8b61 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	122 rem_secs = float(rem) / tick_wake * tick_secs
c3eb67cd8b61 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	123
c3eb67cd8b61 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	124 next_wake_secs = next_wake - rem_secs
c3eb67cd8b61 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	125 L("next_wake_secs %f\n", next_wake_secs)
c3eb67cd8b61 handle rem from btoff Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	126 return next_wake_secs
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	127
32 e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	128 @retry()
e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	129 def clear_meas(sock):
119 81591bdfa92c try to flush Matt Johnston <matt@ucc.asn.au> parents: 117 diff changeset	130 flush(sock)
32 e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	131 sock.send("clear\n");
e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	132 l = readline(sock)
e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	133 if l and l.rstrip() == 'cleared':
e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	134 return True
e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	135
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	136 E("Bad response to clear '%s'" % str(l))
32 e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	137 return False
e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	138
28 e3e0ed7758f9 hmac Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	139 def send_results(lines):
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	140 enc_lines = binascii.b2a_base64(zlib.compress('\n'.join(lines)))
35 4bfa9b7b2e4b - fix mac/urllib to work Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	141 mac = hmac.new(config.HMAC_KEY, enc_lines).hexdigest()
28 e3e0ed7758f9 hmac Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	142
35 4bfa9b7b2e4b - fix mac/urllib to work Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	143 url_data = urllib.urlencode( {'lines': enc_lines, 'hmac': mac} )
28 e3e0ed7758f9 hmac Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	144 con = urllib2.urlopen(config.UPDATE_URL, url_data)
32 e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	145 result = con.read(100)
e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	146 if result == 'OK':
e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	147 return True
e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	148 else:
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	149 W("Bad result '%s'" % result)
32 e18d7e89c17d More minor work Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	150 return False
28 e3e0ed7758f9 hmac Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	151
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	152 def do_comms(sock):
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	153 L("do_comms")
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	154 d = None
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	155 # serial could be unreliable, try a few times
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	156 d = fetch(sock)
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	157 if not d:
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	158 return
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	159
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	160 res = send_results(d)
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	161 if not res:
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	162 return
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	163
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	164 clear_meas(sock)
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	165
117 eecd2612a68e stay on Matt Johnston <matt@ucc.asn.au> parents: 100 diff changeset	166 next_wake = 600
eecd2612a68e stay on Matt Johnston <matt@ucc.asn.au> parents: 100 diff changeset	167 #next_wake = turn_off(sock)
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	168 sock.close()
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	169 return next_wake
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	170
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	171 testcount = 0
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	172
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	173 def sleep_for(secs):
23 b5925cb4f264 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	174 until = monotonic_time() + secs
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	175 while True:
24 44c5ab5ea879 - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 23 diff changeset	176 length = until - monotonic_time()
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	177 if length <= 0:
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	178 return
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	179 time.sleep(length)
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	180
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	181 def setup_logging():
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	182 logging.basicConfig(format='%(asctime)s %(message)s',
91 231662c6690c handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 89 diff changeset	183 datefmt='%m/%d/%Y %I:%M:%S %p',
231662c6690c handle new next_wake format Matt Johnston <matt@ucc.asn.au> parents: 89 diff changeset	184 level=logging.INFO)
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	185
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	186 def main():
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	187 setup_logging()
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	188
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	189 L("Running templog rfcomm server")
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	190
65 b09c164debf6 cheap_daemon() Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	191 if '--daemon' in sys.argv:
b09c164debf6 cheap_daemon() Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	192 utils.cheap_daemon()
b09c164debf6 cheap_daemon() Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	193
96 b2d0887fb306 be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	194 next_wake_time = 0
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	195 while True:
23 b5925cb4f264 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	196 sock = None
b5925cb4f264 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	197 try:
82 0f7c005b3f87 move server config into config.py Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	198 sock = get_socket(config.BTADDR)
23 b5925cb4f264 Fix bugs in server code (try actually running it) Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	199 except Exception, e:
94 229b740a607f use the remainder of times Matt Johnston <matt@ucc.asn.au> parents: 92 diff changeset	200 #logging.exception("Error connecting")
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	201 pass
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	202 if sock:
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	203 try:
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	204 avr_wake = do_comms(sock)
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	205 next_wake_time = time.time() + avr_wake
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	206 except Exception, e:
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	207 logging.exception("Error in do_comms")
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	208
96 b2d0887fb306 be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	209 next_wake_interval = next_wake_time - time.time() + EXTRA_WAKEUP
89 51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	210 sleep_time = config.SLEEP_TIME
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	211 if next_wake_interval > 0:
51d889ad39a3 main.c : add a delay before turning on uart Matt Johnston <matt@ucc.asn.au> parents: 82 diff changeset	212 sleep_time = min(next_wake_interval, sleep_time)
96 b2d0887fb306 be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	213 if next_wake_interval < 0 and next_wake_interval > -30:
b2d0887fb306 be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	214 L("not sleeping, next_wake_interval overdue %f" % next_wake_interval)
b2d0887fb306 be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	215 continue
b2d0887fb306 be quicker responding Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	216 L("Sleeping for %d, next wake interval %f" % (sleep_time, next_wake_interval))
22 885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	217 sleep_for(sleep_time)
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	218
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	219 if __name__ == '__main__':
885532437100 A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	220 main()

Mercurial > templog

annotate server/ts.py @ 125:397ac5c079bf