Mercurial > templog
annotate web/log.py @ 405:d9b78a1bdd1d
fix off-by-one in remainder code
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 17 Jul 2012 21:58:49 +0800 |
| parents | 56c32a62b0cd |
| children | fd8482365489 |
| 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'] | |
| 367 | 37 else: |
| 369 | 38 args = [ |
| 39 '--step', '300', | |
|
394
2cd246ea92c6
increase temperature logging range
Matt Johnston <matt@ucc.asn.au>
parents:
384
diff
changeset
|
40 'DS:temp:GAUGE:600:-100:500', |
| 367 | 41 'RRA:AVERAGE:0.5:1:1051200'] |
| 333 | 42 |
| 367 | 43 rrdtool.create(sensor_rrd_path(sensor_id), |
| 369 | 44 '--start', 'now-60d', |
| 367 | 45 *args) |
| 335 | 46 |
| 47 # stolen from viewmtn, stolen from monotone-viz | |
| 48 def colour_from_string(str): | |
| 49 def f(off): | |
| 50 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
|
51 hashval = hashlib.sha1(str).digest() |
| 335 | 52 hue = f(5) |
| 53 li = f(1) * 0.15 + 0.55 | |
| 54 sat = f(2) * 0.5 + .5 | |
| 55 return ''.join(["%.2x" % int(x * 256) for x in hls_to_rgb(hue, li, sat)]) | |
| 56 | |
| 57 def graph_png(start, length): | |
| 58 rrds = all_sensors() | |
| 59 | |
| 60 graph_args = [] | |
| 367 | 61 have_volts = False |
| 335 | 62 for n, (rrdfile, sensor) in enumerate(rrds): |
| 367 | 63 if 'avrtemp' in sensor: |
| 64 continue | |
| 65 if 'voltage' in sensor: | |
| 66 have_volts = True | |
| 67 vname = 'scalevolts' | |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
68 graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals()) |
| 384 | 69 unit = 'V' |
| 367 | 70 else: |
| 71 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
|
72 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals()) |
|
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
73 graph_args.append('CDEF:%(vname)s=raw%(vname)s,0.1,*,2,+' % locals()) |
| 384 | 74 unit = '<span face="Liberation Serif">ยบ</span>C' |
| 75 | |
| 76 last_value = float(rrdtool.info(rrdfile)['ds[temp].last_ds']) | |
| 335 | 77 width = config.LINE_WIDTH |
| 78 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
|
79 colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor)) |
| 384 | 80 format_last_value = ('%f' % last_value).rstrip('0') + unit |
| 81 print_legend = '%s (%s)' % (legend, format_last_value) | |
| 82 graph_args.append('LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals()) | |
| 335 | 83 |
| 373 | 84 end = int(start+length) |
| 85 start = int(start) | |
| 86 | |
| 335 | 87 tempf = tempfile.NamedTemporaryFile() |
| 373 | 88 dateformat = '%H:%M:%S %Y-%m-%d' |
| 89 watermark = ("Now %s\t" | |
| 90 "Start %s\t" | |
| 91 "End %s" % ( | |
| 92 datetime.datetime.now().strftime(dateformat), | |
| 93 datetime.datetime.fromtimestamp(start).strftime(dateformat), | |
| 94 datetime.datetime.fromtimestamp(end).strftime(dateformat) )) | |
| 95 | |
| 96 args = [tempf.name, '-s', str(start), | |
| 97 '-e', str(end), | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
98 '-w', str(config.GRAPH_WIDTH), |
|
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
99 '-h', str(config.GRAPH_HEIGHT), |
| 335 | 100 '--slope-mode', |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
101 '--border', '0', |
|
379
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
102 # '--vertical-label', 'Voltage', |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
103 '--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
|
104 '--dynamic-labels', |
| 362 | 105 '--grid-dash', '1:0', |
| 383 | 106 '--zoom', str(config.ZOOM), |
| 362 | 107 '--color', 'GRID#00000000', |
| 108 '--color', 'MGRID#aaaaaa', | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
109 '--color', 'BACK#ffffff', |
| 373 | 110 '--disable-rrdtool-tag', |
| 384 | 111 '--pango-markup', |
| 373 | 112 '--watermark', watermark, |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
113 '--imgformat', 'PNG'] \ |
| 335 | 114 + graph_args |
| 373 | 115 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT] |
| 116 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT] | |
| 367 | 117 if have_volts: |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
118 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
|
119 '--right-axis-format', '%.0lf', |
|
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
120 # '--right-axis-label', 'Temperature' |
|
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
121 ] |
| 367 | 122 |
| 335 | 123 rrdtool.graph(*args) |
| 124 return tempf.read() | |
| 125 | |
| 333 | 126 def sensor_update(sensor_id, measurements, first_real_time, time_step): |
| 127 try: | |
| 128 open(sensor_rrd_path(sensor_id)) | |
| 129 except IOError, e: | |
| 130 create_rrd(sensor_id) | |
| 131 | |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
132 if measurements: |
|
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
133 values = ['%d:%f' % p for p in |
|
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
134 zip((first_real_time + time_step*t for t in xrange(len(measurements))), |
|
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
135 measurements)] |
| 333 | 136 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
137 rrdfile = sensor_rrd_path(sensor_id) |
| 346 | 138 # 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
|
139 for v in values: |
|
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
140 try: |
|
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
141 rrdtool.update(rrdfile, v) |
| 369 | 142 except rrdtool.error, e: |
|
355
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
143 print>>sys.stderr, "Bad rrdtool update '%s'" % v |
|
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
144 traceback.print_exc(file=sys.stderr) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
145 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
146 # be paranoid |
|
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
147 f = file(rrdfile) |
|
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
148 os.fsync(f.fileno()) |
| 333 | 149 |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
150 def record_debug(lines): |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
151 f = open('%s/debug.log' % config.DATA_PATH, 'a+') |
|
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
152 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
|
153 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
|
154 f.flush() |
|
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
155 return f |
|
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
156 |
|
381
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
157 def convert_ds18b20_12bit(reading): |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
158 value = struct.unpack('>h', binascii.unhexlify(reading))[0] |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
159 return value * 0.0625 |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
160 |
| 400 | 161 def time_rem(name, entries): |
| 162 val_ticks = int(entries[name]) | |
| 401 | 163 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
|
164 tick_wake = int(entries['tick_wake']) + 1 |
| 400 | 165 tick_secs = int(entries['tick_secs']) |
| 166 return val_ticks + float(val_rem) * tick_secs / tick_wake | |
| 167 | |
| 333 | 168 def parse(lines): |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
169 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
170 debugf = record_debug(lines) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
171 |
| 333 | 172 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
|
173 if len(entries) != len(lines): |
| 333 | 174 raise Exception("Keys are not unique") |
| 175 | |
| 176 num_sensors = int(entries['sensors']) | |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
177 num_measurements = int(entries['measurements']) |
| 333 | 178 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
179 sensors = [entries['sensor_id%d' % n] for n in xrange(num_sensors)] |
| 333 | 180 |
| 181 meas = [] | |
| 182 for s in sensors: | |
| 183 meas.append([]) | |
| 184 | |
| 185 for n in xrange(num_measurements): | |
| 383 | 186 vals = [convert_ds18b20_12bit(x) for x in entries["meas%d" % n].strip().split()] |
| 333 | 187 if len(vals) != num_sensors: |
| 188 raise Exception("Wrong number of sensors for measurement %d" % n) | |
| 189 # we make an array of values for each sensor | |
| 190 for s in xrange(num_sensors): | |
| 191 meas[s].append(vals[s]) | |
| 192 | |
| 400 | 193 avr_now = time_rem('now', entries) |
| 194 avr_first_time = time_rem('first_time', entries) | |
| 195 avr_comms_time = time_rem('comms_time', entries) | |
| 333 | 196 time_step = float(entries['time_step']) |
| 197 | |
| 400 | 198 debugf.write('now %f, comms_time %f, first_time %f, delta %f\n' % |
| 199 (avr_now, avr_comms_time, avr_first_time, avr_now - avr_comms_time)) | |
| 200 | |
| 367 | 201 if 'avrtemp' in entries: |
| 202 avrtemp = val_scale(int(entries['avrtemp'])) | |
| 203 sensor_update('avrtemp', [avrtemp], time.time(), 1) | |
| 204 | |
| 205 if 'voltage' in entries: | |
| 206 voltage = 0.001 * int(entries['voltage']) | |
| 207 sensor_update('voltage', [voltage], time.time(), 1) | |
| 208 | |
| 346 | 209 #sqlite |
| 210 # - time | |
| 211 # - voltage | |
| 212 # - boot time | |
| 213 | |
| 333 | 214 first_real_time = time.time() - (avr_now - avr_first_time) |
| 215 | |
| 216 for sensor_id, measurements in zip(sensors, meas): | |
| 346 | 217 # XXX sqlite add |
| 333 | 218 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
|
219 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
220 debugf.write("Updated %d sensors\n" % len(sensors)) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
221 debugf.flush() |