Mercurial > templog
annotate web/log.py @ 425:eb685e1afcbb
ui tweaks, add fridge values
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 11 Oct 2012 19:19:24 +0800 |
| parents | 96bec5482294 |
| children | 719d5669ab27 |
| rev | line source |
|---|---|
| 384 | 1 # -*- coding: utf-8 -*- |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
2 #:vim:et:ts=4:sts=4:sw=4: |
| 333 | 3 import rrdtool |
| 4 import os | |
| 335 | 5 import os.path |
| 333 | 6 import sys |
| 335 | 7 import glob |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
8 import hashlib |
|
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
9 import tempfile |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
10 import time |
|
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
11 import syslog |
| 349 | 12 import sqlite3 |
|
355
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
13 import traceback |
| 373 | 14 import datetime |
|
381
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
15 import struct |
| 383 | 16 import binascii |
| 335 | 17 from colorsys import hls_to_rgb |
| 333 | 18 |
| 334 | 19 import config |
| 333 | 20 |
| 21 def sensor_rrd_path(s): | |
| 334 | 22 return '%s/sensor_%s.rrd' % (config.DATA_PATH, s) |
| 333 | 23 |
| 335 | 24 # returns (path, sensor_name) tuples |
| 25 def all_sensors(): | |
| 26 return [(r, os.path.basename(r[:-4])) | |
| 27 for r in glob.glob('%s/*.rrd' % config.DATA_PATH)] | |
| 28 | |
| 333 | 29 def create_rrd(sensor_id): |
|
350
03322c38b4a9
Create with a start date so that it works
Matt Johnston <matt@ucc.asn.au>
parents:
346
diff
changeset
|
30 # start date of 10 seconds into 1970 is used so that we can |
|
03322c38b4a9
Create with a start date so that it works
Matt Johnston <matt@ucc.asn.au>
parents:
346
diff
changeset
|
31 # update with prior values straight away. |
| 367 | 32 if 'voltage' in sensor_id: |
| 369 | 33 args = [ |
| 34 '--step', '3600', | |
| 35 'DS:temp:GAUGE:7200:1:10', | |
| 36 'RRA:AVERAGE:0.5:1:87600'] | |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
37 elif 'fridge_on' in sensor_id: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
38 args = [ |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
39 '--step', '300', |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
40 'DS:temp:GAUGE:600:-100:500', |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
41 'RRA:LAST:0.5:1:1051200'] |
| 367 | 42 else: |
| 369 | 43 args = [ |
| 44 '--step', '300', | |
|
394
2cd246ea92c6
increase temperature logging range
Matt Johnston <matt@ucc.asn.au>
parents:
384
diff
changeset
|
45 'DS:temp:GAUGE:600:-100:500', |
| 367 | 46 'RRA:AVERAGE:0.5:1:1051200'] |
| 333 | 47 |
| 367 | 48 rrdtool.create(sensor_rrd_path(sensor_id), |
| 369 | 49 '--start', 'now-60d', |
| 367 | 50 *args) |
| 335 | 51 |
| 52 # stolen from viewmtn, stolen from monotone-viz | |
| 53 def colour_from_string(str): | |
| 54 def f(off): | |
| 55 return ord(hashval[off]) / 256.0 | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
56 hashval = hashlib.sha1(str).digest() |
| 335 | 57 hue = f(5) |
| 58 li = f(1) * 0.15 + 0.55 | |
| 59 sat = f(2) * 0.5 + .5 | |
| 60 return ''.join(["%.2x" % int(x * 256) for x in hls_to_rgb(hue, li, sat)]) | |
| 61 | |
| 62 def graph_png(start, length): | |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
63 os.environ['MATT_PNG_BODGE_COMPRESS'] = '4' |
|
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
64 os.environ['MATT_PNG_BODGE_FILTER'] = 'paeth' |
| 335 | 65 rrds = all_sensors() |
| 66 | |
| 67 graph_args = [] | |
| 367 | 68 have_volts = False |
| 335 | 69 for n, (rrdfile, sensor) in enumerate(rrds): |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
70 unit = None |
| 367 | 71 if 'avrtemp' in sensor: |
| 72 continue | |
| 73 if 'voltage' in sensor: | |
| 74 have_volts = True | |
| 75 vname = 'scalevolts' | |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
76 graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals()) |
| 384 | 77 unit = 'V' |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
78 elif 'fridge_on' in sensor: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
79 vname = 'fridge_on' |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
80 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:LAST' % locals()) |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
81 graph_args.append('CDEF:%(vname)s=raw%(vname)s,3,+' % locals()) |
| 367 | 82 else: |
| 83 vname = 'temp%d' % n | |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
84 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals()) |
|
407
36a33c56c383
limit temps to 35º on graph
Matt Johnston <matt@ucc.asn.au>
parents:
405
diff
changeset
|
85 # limit max temp to 50 |
|
36a33c56c383
limit temps to 35º on graph
Matt Johnston <matt@ucc.asn.au>
parents:
405
diff
changeset
|
86 graph_args.append('CDEF:%(vname)s=raw%(vname)s,35,GT,UNKN,raw%(vname)s,0.1,*,2,+,IF' % locals()) |
| 384 | 87 unit = '<span face="Liberation Serif">º</span>C' |
| 88 | |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
89 format_last_value = None |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
90 if unit: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
91 try: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
92 last_value = float(rrdtool.info(rrdfile)['ds[temp].last_ds']) |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
93 format_last_value = ('%f' % last_value).rstrip('0.') + unit |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
94 except ValueError: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
95 pass |
| 335 | 96 width = config.LINE_WIDTH |
| 97 legend = config.SENSOR_NAMES.get(sensor, sensor) | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
98 colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor)) |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
99 if format_last_value: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
100 print_legend = '%s (%s)' % (legend, format_last_value) |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
101 else: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
102 print_legend = legend |
| 384 | 103 graph_args.append('LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals()) |
| 335 | 104 |
| 373 | 105 end = int(start+length) |
| 106 start = int(start) | |
| 107 | |
| 335 | 108 tempf = tempfile.NamedTemporaryFile() |
| 373 | 109 dateformat = '%H:%M:%S %Y-%m-%d' |
| 110 watermark = ("Now %s\t" | |
| 111 "Start %s\t" | |
| 112 "End %s" % ( | |
| 113 datetime.datetime.now().strftime(dateformat), | |
| 114 datetime.datetime.fromtimestamp(start).strftime(dateformat), | |
| 115 datetime.datetime.fromtimestamp(end).strftime(dateformat) )) | |
| 116 | |
| 117 args = [tempf.name, '-s', str(start), | |
| 118 '-e', str(end), | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
119 '-w', str(config.GRAPH_WIDTH), |
|
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
120 '-h', str(config.GRAPH_HEIGHT), |
| 335 | 121 '--slope-mode', |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
122 '--border', '0', |
|
379
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
123 # '--vertical-label', 'Voltage', |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
124 '--y-grid', '0.1:1', |
|
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
125 '--dynamic-labels', |
| 362 | 126 '--grid-dash', '1:0', |
| 383 | 127 '--zoom', str(config.ZOOM), |
| 362 | 128 '--color', 'GRID#00000000', |
| 129 '--color', 'MGRID#aaaaaa', | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
130 '--color', 'BACK#ffffff', |
| 373 | 131 '--disable-rrdtool-tag', |
| 384 | 132 '--pango-markup', |
| 373 | 133 '--watermark', watermark, |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
134 '--imgformat', 'PNG'] \ |
| 335 | 135 + graph_args |
| 373 | 136 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT] |
| 137 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT] | |
| 367 | 138 if have_volts: |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
139 args += ['--right-axis', '10:-20', # matches the scalevolts CDEF above |
|
379
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
140 '--right-axis-format', '%.0lf', |
|
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
141 # '--right-axis-label', 'Temperature' |
|
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
142 ] |
| 367 | 143 |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
144 print>>sys.stderr, ' '.join("'%s'" % s for s in args) |
| 335 | 145 rrdtool.graph(*args) |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
146 #return tempf |
| 335 | 147 return tempf.read() |
| 148 | |
| 424 | 149 def validate_values(measurements): |
| 150 for m in measurements: | |
| 151 if m == 85: | |
| 152 yield 'U' | |
| 153 else: | |
| 154 yield '%f' % m | |
| 155 | |
| 333 | 156 def sensor_update(sensor_id, measurements, first_real_time, time_step): |
| 157 try: | |
| 158 open(sensor_rrd_path(sensor_id)) | |
| 159 except IOError, e: | |
| 160 create_rrd(sensor_id) | |
| 161 | |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
162 if measurements: |
| 424 | 163 values = ['%d:%s' % p for p in |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
164 zip((first_real_time + time_step*t for t in xrange(len(measurements))), |
| 424 | 165 validate_values(measurements))] |
| 333 | 166 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
167 rrdfile = sensor_rrd_path(sensor_id) |
| 346 | 168 # XXX what to do here when it fails... |
|
355
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
169 for v in values: |
|
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
170 try: |
|
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
171 rrdtool.update(rrdfile, v) |
| 369 | 172 except rrdtool.error, e: |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
173 print>>sys.stderr, "Bad rrdtool update '%s': %s" % (v, str(e)) |
|
355
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
174 traceback.print_exc(file=sys.stderr) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
175 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
176 # be paranoid |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
177 #f = file(rrdfile) |
|
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
178 #os.fsync(f.fileno()) |
| 333 | 179 |
| 409 | 180 def debug_file(mode='r'): |
| 181 return open('%s/debug.log' % config.DATA_PATH, mode) | |
| 182 | |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
183 def record_debug(lines): |
| 409 | 184 f = debug_file('a+') |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
185 f.write('===== %s =====\n' % time.strftime('%a, %d %b %Y %H:%M:%S')) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
186 f.writelines(('%s\n' % s for s in lines)) |
|
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
187 f.flush() |
|
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
188 return f |
|
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
189 |
| 409 | 190 |
| 191 def tail_debug_log(): | |
| 192 f = debug_file() | |
| 193 f.seek(0, 2) | |
| 194 size = f.tell() | |
| 195 f.seek(max(0, size-30000)) | |
| 196 return '\n'.join(l.strip() for l in f.readlines()[-400:]) | |
| 197 | |
|
381
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
198 def convert_ds18b20_12bit(reading): |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
199 value = struct.unpack('>h', binascii.unhexlify(reading))[0] |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
200 return value * 0.0625 |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
201 |
| 400 | 202 def time_rem(name, entries): |
| 203 val_ticks = int(entries[name]) | |
| 401 | 204 val_rem = int(entries['%s_rem' % name]) |
|
405
d9b78a1bdd1d
fix off-by-one in remainder code
Matt Johnston <matt@ucc.asn.au>
parents:
401
diff
changeset
|
205 tick_wake = int(entries['tick_wake']) + 1 |
| 400 | 206 tick_secs = int(entries['tick_secs']) |
| 207 return val_ticks + float(val_rem) * tick_secs / tick_wake | |
| 208 | |
| 333 | 209 def parse(lines): |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
210 |
|
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
211 start_time = time.time() |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
212 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
213 debugf = record_debug(lines) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
214 |
| 333 | 215 entries = dict(l.split('=', 1) for l in lines) |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
216 if len(entries) != len(lines): |
| 333 | 217 raise Exception("Keys are not unique") |
| 218 | |
| 219 num_sensors = int(entries['sensors']) | |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
220 num_measurements = int(entries['measurements']) |
| 333 | 221 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
222 sensors = [entries['sensor_id%d' % n] for n in xrange(num_sensors)] |
| 333 | 223 |
| 224 meas = [] | |
| 225 for s in sensors: | |
| 226 meas.append([]) | |
| 227 | |
| 228 for n in xrange(num_measurements): | |
| 383 | 229 vals = [convert_ds18b20_12bit(x) for x in entries["meas%d" % n].strip().split()] |
| 333 | 230 if len(vals) != num_sensors: |
| 231 raise Exception("Wrong number of sensors for measurement %d" % n) | |
| 232 # we make an array of values for each sensor | |
| 233 for s in xrange(num_sensors): | |
| 234 meas[s].append(vals[s]) | |
| 235 | |
| 400 | 236 avr_now = time_rem('now', entries) |
| 237 avr_first_time = time_rem('first_time', entries) | |
| 238 avr_comms_time = time_rem('comms_time', entries) | |
| 333 | 239 time_step = float(entries['time_step']) |
| 240 | |
| 400 | 241 debugf.write('now %f, comms_time %f, first_time %f, delta %f\n' % |
| 242 (avr_now, avr_comms_time, avr_first_time, avr_now - avr_comms_time)) | |
| 243 | |
| 367 | 244 if 'avrtemp' in entries: |
| 245 avrtemp = val_scale(int(entries['avrtemp'])) | |
| 246 sensor_update('avrtemp', [avrtemp], time.time(), 1) | |
| 247 | |
| 248 if 'voltage' in entries: | |
| 249 voltage = 0.001 * int(entries['voltage']) | |
| 250 sensor_update('voltage', [voltage], time.time(), 1) | |
| 251 | |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
252 if 'fridge_status' in entries: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
253 fridge_on = int(entries['fridge_status']) |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
254 sensor_update('fridge_on', [fridge_on], time.time(), 1) |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
255 |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
256 if 'fridge' in entries: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
257 fridge_setpoint = float(entries['fridge']) |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
258 sensor_update('fridge_setpoint', [fridge_setpoint], time.time(), 1) |
| 346 | 259 #sqlite |
| 260 # - time | |
| 261 # - voltage | |
| 262 # - boot time | |
| 263 | |
| 333 | 264 first_real_time = time.time() - (avr_now - avr_first_time) |
| 265 | |
| 266 for sensor_id, measurements in zip(sensors, meas): | |
| 346 | 267 # XXX sqlite add |
| 333 | 268 sensor_update(sensor_id, measurements, first_real_time, time_step) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
269 |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
270 timedelta = time.time() - start_time |
|
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
271 debugf.write("Updated %d sensors in %.2f secs\n" % (len(sensors), timedelta)) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
272 debugf.flush() |