Mercurial > templog
changeset 395:f0ddb75bcf04
main.c : add a delay before turning on uart
server : try and improve timeouts, get rid of lightblue, don't use https,
use python logging module
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sun, 15 Jul 2012 21:49:59 +0800 |
| parents | 2cd246ea92c6 |
| children | a17a5984116f |
| files | main.c server/ts.py server/utils.py web/config.py |
| diffstat | 4 files changed, 62 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/main.c Thu Jul 12 23:47:29 2012 +0800 +++ b/main.c Sun Jul 15 21:49:59 2012 +0800 @@ -238,7 +238,7 @@ static void uart_off() { - // Turn of interrupts and disable tx/rx + // Turn off interrupts and disable tx/rx UCSR0B = 0; uart_enabled = 0; @@ -679,6 +679,8 @@ last_comms_clock = clock_epoch; } set_aux_power(1); + // avoid receiving rubbish, perhaps + _delay_ms(50); uart_on(); // write sd card here? same 3.3v regulator...
--- a/server/ts.py Thu Jul 12 23:47:29 2012 +0800 +++ b/server/ts.py Sun Jul 15 21:49:59 2012 +0800 @@ -19,35 +19,29 @@ import zlib import urllib import urllib2 +import logging + +L = logging.info +W = logging.warning +E = logging.error import config from utils import monotonic_time, retry, readline, crc16 import utils -lightblue = None -try: - import lightblue -except ImportError: - import bluetooth +import bluetooth def get_socket(addr): - if lightblue: - s = lightblue.socket() - s.connect((addr, 1)) - s.settimeout(3) - else: - s = bluetooth.BluetoothSocket( bluetooth.RFCOMM ) - s.connect((addr, 1)) - - s.setblocking(False) + s = bluetooth.BluetoothSocket( bluetooth.RFCOMM ) + s.settimeout(1) + s.connect((addr, 1)) return s @retry() def fetch(sock): - print "fetch" sock.send("fetch\n") crc = 0 @@ -55,7 +49,7 @@ lines = [] l = readline(sock) if l != 'START\n': - print>>sys.stderr, "Bad expected START line '%s'\n" % l.rstrip('\n') + W("Bad expected START line '%s'\n" % l.rstrip('\n')) return None crc = crc16(l, crc) @@ -69,13 +63,13 @@ lines.append(l.rstrip('\n')) - print lines - + for d in lines: + L("Received: %s" % d) + l = readline(sock) recv_crc = None try: k, v = l.rstrip('\n').split('=') - print k,v if k == 'CRC': recv_crc = int(v) if recv_crc < 0 or recv_crc > 0xffff: @@ -84,11 +78,11 @@ pass if recv_crc is None: - print>>sys.stderr, "Bad expected CRC line '%s'\n" % l.rstrip('\n') + W("Bad expected CRC line '%s'\n" % l.rstrip('\n')) return None if recv_crc != crc: - print>>sys.stderr, "Bad CRC: calculated 0x%x vs received 0x%x\n" % (crc, recv_crc) + W("Bad CRC: calculated 0x%x vs received 0x%x\n" % (crc, recv_crc)) return None return lines @@ -97,19 +91,19 @@ def turn_off(sock): if TESTING: return 99 - print>>sys.stderr, "sending btoff" + L("Sending btoff") sock.send("btoff\n"); # read newline l = readline(sock) if not l: - print>>sys.stderr, "Bad response to btoff\n" + W("Bad response to btoff") return None if not l.startswith('off:'): - print>>sys.stderr, "Bad response to btoff '%s'\n" % l + W("Bad response to btoff '%s'" % l) return None off, next_wake = l.rstrip().split(':') - print>>sys.stderr, "Next wake %s" % next_wake + L("Next wake %s" % next_wake) return int(next_wake) @@ -120,7 +114,7 @@ if l and l.rstrip() == 'cleared': return True - print>>sys.stderr, "Bad response to clear %s\n" % str(l) + E("Bad response to clear '%s'" % str(l)) return False def send_results(lines): @@ -133,18 +127,14 @@ if result == 'OK': return True else: - print>>sys.stderr, "Bad result '%s'" % result + W("Bad result '%s'" % result) return False def do_comms(sock): - print "do_comms" + L("do_comms") d = None # serial could be unreliable, try a few times - for i in range(FETCH_TRIES): - d = fetch(sock) - if d: - break - time.sleep(1) + d = fetch(sock) if not d: return @@ -168,8 +158,14 @@ return time.sleep(length) +def setup_logging(): + logging.basicConfig(format='%(asctime)s %(message)s', + datefmt='%m/%d/%Y %I:%M:%S %p') + def main(): - next_wake_time = 0 + setup_logging() + + L("Running templog rfcomm server") if '--daemon' in sys.argv: utils.cheap_daemon() @@ -179,21 +175,22 @@ try: sock = get_socket(config.BTADDR) except Exception, e: - print>>sys.stderr, "Error connecting:" - traceback.print_exc(file=sys.stderr) - sleep_time = config.SLEEP_TIME + pass + #print>>sys.stderr, "Error connecting:" + #traceback.print_exc(file=sys.stderr) + next_wake_time = 0 if sock: - next_wake = None try: - next_wake_interval = do_comms(sock) - next_wake_time = time.time() + next_wake_interval + avr_wake = do_comms(sock) + next_wake_time = time.time() + avr_wake except Exception, e: - print>>sys.stderr, "Error in do_comms:" - traceback.print_exc(file=sys.stderr) - if next_wake_time > time.time(): - sleep_time = min(next_wake_time - time.time() - EXTRA_WAKEUP, sleep_time) + logging.exception("Error in do_comms") - print "Sleeping for %d" % sleep_time + next_wake_interval = next_wake_time - time.time() - EXTRA_WAKEUP + sleep_time = config.SLEEP_TIME + if next_wake_interval > 0: + sleep_time = min(next_wake_interval, sleep_time) + L("Sleeping for %d, next wake time %f" % (sleep_time, next_wake_time)) sleep_for(sleep_time) if __name__ == '__main__':
--- a/server/utils.py Thu Jul 12 23:47:29 2012 +0800 +++ b/server/utils.py Sun Jul 15 21:49:59 2012 +0800 @@ -3,15 +3,14 @@ #import ctypes import time import select +import logging -lightblue = None -try: - import lightblue -except ImportError: - pass +L = logging.info +W = logging.warning +E = logging.error DEFAULT_TRIES = 3 -READLINE_SELECT_TIMEOUT = 4 +READLINE_SELECT_TIMEOUT = 1 __all__ = ('monotonic_time', 'retry') @@ -34,7 +33,7 @@ clock_gettime = librt.clock_gettime clock_gettime.argtypes = [ctypes.c_int, ctypes.POINTER(timespec)] except: - print>>sys.stderr, "No clock_gettime(), using fake fallback." + W("No clock_gettime(), using fake fallback.") no_clock_gettime = True return time.time() @@ -53,9 +52,11 @@ def new_f(*args, **kwargs): for i in range(retries): d = func(*args, **kwargs) - if d: + if d is not None: return d time.sleep(try_time) + return None + new_f.func_name = func.func_name return new_f return inner @@ -64,11 +65,10 @@ timeout = READLINE_SELECT_TIMEOUT buf = '' while True: - if not lightblue: - (rlist, wlist, xlist) = select.select([sock], [], [], timeout) - if sock not in rlist: - # hit timeout - return None + (rlist, wlist, xlist) = select.select([sock], [], [], timeout) + if sock not in rlist: + # hit timeout + return None c = sock.recv(1) if c == '': @@ -99,7 +99,7 @@ return crc def cheap_daemon(): - print "Daemonising." + L("Daemonising.") sys.stdout.flush() sys.stderr.flush() out = file('/dev/null', 'a+') @@ -111,7 +111,7 @@ if pid > 0: sys.exit(0) except OSError, e: - print>>sys.stderr, "Bad fork()" + E("Bad fork()") sys.exit(1) os.setsid() @@ -121,7 +121,7 @@ if pid > 0: sys.exit(0) except OSError, e: - print>>sys.stderr, "Bad fork()" + E("Bad fork()") sys.exit(1)
--- a/web/config.py Thu Jul 12 23:47:29 2012 +0800 +++ b/web/config.py Sun Jul 15 21:49:59 2012 +0800 @@ -7,7 +7,7 @@ HMAC_KEY = 'a hmac key' # override in local config file -UPDATE_URL = 'https://evil.ucc.asn.au/~matt/templog/update' +UPDATE_URL = 'http://evil.ucc.asn.au/~matt/templog/update' GRAPH_WIDTH = 1200 GRAPH_HEIGHT = 600