Mercurial > templog
annotate py/uploader.py @ 261:c3600a9fa747
merge long polling
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 09 Jun 2015 23:39:22 +0800 |
| parents | 26eee8591f61 |
| children | 78c542f03030 d15dda1b1f76 |
| rev | line source |
|---|---|
| 145 | 1 import json |
| 2 import hmac | |
|
233
19569cb5ed46
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
231
diff
changeset
|
3 import hashlib |
| 145 | 4 import zlib |
| 160 | 5 import binascii |
|
215
4d82099d1fe0
use requests rather than urllib2, better ipv6->ipv4 fallback
Matt Johnston <matt@ucc.asn.au>
parents:
190
diff
changeset
|
6 import logging |
| 228 | 7 import asyncio |
| 160 | 8 |
| 228 | 9 import aiohttp |
| 160 | 10 |
| 11 import config | |
| 12 from utils import L,D,EX,W,E | |
| 13 import utils | |
| 145 | 14 |
| 228 | 15 class Uploader(object): |
| 145 | 16 def __init__(self, server): |
| 17 self.server = server | |
| 18 | |
| 228 | 19 @asyncio.coroutine |
| 20 def run(self): | |
| 21 # wait for the first read | |
| 22 yield from asyncio.sleep(5) | |
| 145 | 23 while True: |
| 228 | 24 yield from self.do() |
| 259 | 25 yield from asyncio.sleep(config.UPLOAD_SLEEP) |
| 145 | 26 |
| 27 def get_tosend(self, readings): | |
| 28 tosend = {} | |
| 29 | |
| 30 tosend['fridge_on'] = self.server.fridge.is_on() | |
| 31 | |
| 32 tosend['now'] = self.server.now() | |
| 33 tosend['readings'] = readings | |
| 34 | |
| 35 tosend['wort_name'] = self.server.wort_name | |
| 160 | 36 tosend['fridge_name'] = self.server.wort_name |
| 145 | 37 |
| 190 | 38 tosend['current_params'] = dict(self.server.params) |
|
253
0a1b642e3086
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
241
diff
changeset
|
39 tosend['current_params_epoch'] = self.server.params.get_epoch() |
| 145 | 40 |
| 41 tosend['start_time'] = self.server.start_time | |
| 42 tosend['uptime'] = utils.uptime() | |
| 43 | |
| 44 return tosend | |
| 45 | |
| 228 | 46 @asyncio.coroutine |
| 145 | 47 def send(self, tosend): |
| 48 js = json.dumps(tosend) | |
|
233
19569cb5ed46
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
231
diff
changeset
|
49 if self.server.test_mode(): |
|
19569cb5ed46
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
231
diff
changeset
|
50 D("Would upload %s to %s" % (js, config.UPDATE_URL)) |
|
19569cb5ed46
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
231
diff
changeset
|
51 return |
| 241 | 52 js_enc = binascii.b2a_base64(zlib.compress(js.encode())).strip() |
| 53 mac = hmac.new(config.HMAC_KEY.encode(), js_enc, hashlib.sha256).hexdigest() | |
| 54 send_data = {'data': js_enc.decode(), 'hmac': mac} | |
| 228 | 55 r = yield from asyncio.wait_for(aiohttp.request('post', config.UPDATE_URL, data=send_data), 60) |
| 56 result = yield from asyncio.wait_for(r.text(), 60) | |
|
253
0a1b642e3086
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
241
diff
changeset
|
57 if r.status == 200 and result != 'OK': |
| 145 | 58 raise Exception("Server returned %s" % result) |
| 59 | |
| 228 | 60 @asyncio.coroutine |
| 160 | 61 def do(self): |
| 145 | 62 try: |
|
254
ffe25107d520
put more things inside "try"
Matt Johnston <matt@ucc.asn.au>
parents:
241
diff
changeset
|
63 readings = self.server.take_readings() |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
145
diff
changeset
|
64 tosend = self.get_tosend(readings) |
| 259 | 65 D("tosend >>>%s<<<" % str(tosend)) |
| 160 | 66 nreadings = len(readings) |
| 228 | 67 yield from self.send(tosend) |
| 160 | 68 readings = None |
| 163 | 69 D("Sent updated %d readings" % nreadings) |
| 230 | 70 except Exception as e: |
| 259 | 71 EX("Error in uploader: %s" % str(e)) |
| 145 | 72 finally: |
| 73 if readings is not None: | |
| 74 self.server.pushfront(readings) |