annotate web/log.py @ 436:8841a709ae78

strip multiple-of-ten temperatures correctly
author Matt Johnston <matt@ucc.asn.au>
date Mon, 22 Oct 2012 21:08:31 +0800
parents ae12b30352f0
children 3b4277aaed3c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
384
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
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
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
3 import rrdtool
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
4 import os
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
5 import os.path
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
6 import sys
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
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
e7f070855a22 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
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
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
14 import datetime
381
83c83014e5e3 report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 379
diff changeset
15 import struct
383
a032051475fe ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 381
diff changeset
16 import binascii
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
17 from colorsys import hls_to_rgb
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
18
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
19 import config
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
20
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21 def sensor_rrd_path(s):
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
22 return '%s/sensor_%s.rrd' % (config.DATA_PATH, s)
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
24 # returns (path, sensor_name) tuples
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
25 def all_sensors():
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
26 return [(r, os.path.basename(r[:-4]))
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
27 for r in glob.glob('%s/*.rrd' % config.DATA_PATH)]
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
28
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
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
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
32 if 'voltage' in sensor_id:
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
33 args = [
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
34 '--step', '3600',
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
35 'DS:temp:GAUGE:7200:1:10',
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
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
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
42 else:
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
43 args = [
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
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
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
46 'RRA:AVERAGE:0.5:1:1051200']
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
47
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
48 rrdtool.create(sensor_rrd_path(sensor_id),
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
49 '--start', 'now-60d',
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
50 *args)
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
51
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
52 # stolen from viewmtn, stolen from monotone-viz
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
53 def colour_from_string(str):
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
54 def f(off):
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
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
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
57 hue = f(5)
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
58 li = f(1) * 0.15 + 0.55
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
59 sat = f(2) * 0.5 + .5
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
60 return ''.join(["%.2x" % int(x * 256) for x in hls_to_rgb(hue, li, sat)])
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
61
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
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
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
65 rrds = all_sensors()
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
66
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
67 graph_args = []
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
68 have_volts = False
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
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
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
71 if 'avrtemp' in sensor:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
72 continue
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
73 if 'voltage' in sensor:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
74 have_volts = True
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
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
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
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())
431
ae12b30352f0 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 425
diff changeset
81 graph_args.append('CDEF:%(vname)s=raw%(vname)s,-0.2,*,3,+' % locals())
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
82 else:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
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
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
87 unit = '<span face="Liberation Serif">º</span>C'
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
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'])
436
8841a709ae78 strip multiple-of-ten temperatures correctly
Matt Johnston <matt@ucc.asn.au>
parents: 431
diff changeset
93 format_last_value = ('%f' % last_value).rstrip('0').rstrip('.') + unit
425
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
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
96 width = config.LINE_WIDTH
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
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
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
103 graph_args.append('LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals())
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
104
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
105 end = int(start+length)
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
106 start = int(start)
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
107
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
108 tempf = tempfile.NamedTemporaryFile()
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
109 dateformat = '%H:%M:%S %Y-%m-%d'
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
110 watermark = ("Now %s\t"
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
111 "Start %s\t"
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
112 "End %s" % (
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
113 datetime.datetime.now().strftime(dateformat),
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
114 datetime.datetime.fromtimestamp(start).strftime(dateformat),
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
115 datetime.datetime.fromtimestamp(end).strftime(dateformat) ))
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
116
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
117 args = [tempf.name, '-s', str(start),
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
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
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
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
8fea6144951b improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 355
diff changeset
126 '--grid-dash', '1:0',
383
a032051475fe ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 381
diff changeset
127 '--zoom', str(config.ZOOM),
362
8fea6144951b improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 355
diff changeset
128 '--color', 'GRID#00000000',
8fea6144951b improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 355
diff changeset
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
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
131 '--disable-rrdtool-tag',
384
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
132 '--pango-markup',
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
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
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
135 + graph_args
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
136 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT]
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
137 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT]
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
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
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
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
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
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
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
147 return tempf.read()
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
148
424
96bec5482294 avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 410
diff changeset
149 def validate_values(measurements):
96bec5482294 avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 410
diff changeset
150 for m in measurements:
96bec5482294 avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 410
diff changeset
151 if m == 85:
96bec5482294 avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 410
diff changeset
152 yield 'U'
96bec5482294 avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 410
diff changeset
153 else:
96bec5482294 avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 410
diff changeset
154 yield '%f' % m
96bec5482294 avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 410
diff changeset
155
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
156 def sensor_update(sensor_id, measurements, first_real_time, time_step):
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
157 try:
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
158 open(sensor_rrd_path(sensor_id))
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
159 except IOError, e:
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
160 create_rrd(sensor_id)
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
161
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
162 if measurements:
424
96bec5482294 avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 410
diff changeset
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
96bec5482294 avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 410
diff changeset
165 validate_values(measurements))]
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
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
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
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
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
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
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
179
409
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
180 def debug_file(mode='r'):
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
181 return open('%s/debug.log' % config.DATA_PATH, mode)
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
182
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
183 def record_debug(lines):
409
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
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
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
190
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
191 def tail_debug_log():
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
192 f = debug_file()
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
193 f.seek(0, 2)
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
194 size = f.tell()
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
195 f.seek(max(0, size-30000))
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
196 return '\n'.join(l.strip() for l in f.readlines()[-400:])
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
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
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
202 def time_rem(name, entries):
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
203 val_ticks = int(entries[name])
401
56c32a62b0cd fix rem calculation
Matt Johnston <matt@ucc.asn.au>
parents: 400
diff changeset
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
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
206 tick_secs = int(entries['tick_secs'])
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
207 return val_ticks + float(val_rem) * tick_secs / tick_wake
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
208
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
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
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
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
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
217 raise Exception("Keys are not unique")
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
218
431
ae12b30352f0 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 425
diff changeset
219 if 'sensors' not in entries:
ae12b30352f0 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 425
diff changeset
220 # only debug info, it's been recorded
ae12b30352f0 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 425
diff changeset
221 return
ae12b30352f0 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 425
diff changeset
222
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
223 num_sensors = int(entries['sensors'])
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
224 num_measurements = int(entries['measurements'])
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
225
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
226 sensors = [entries['sensor_id%d' % n] for n in xrange(num_sensors)]
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
227
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
228 meas = []
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
229 for s in sensors:
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
230 meas.append([])
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
231
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
232 for n in xrange(num_measurements):
383
a032051475fe ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 381
diff changeset
233 vals = [convert_ds18b20_12bit(x) for x in entries["meas%d" % n].strip().split()]
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
234 if len(vals) != num_sensors:
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
235 raise Exception("Wrong number of sensors for measurement %d" % n)
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
236 # we make an array of values for each sensor
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
237 for s in xrange(num_sensors):
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
238 meas[s].append(vals[s])
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
239
400
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
240 avr_now = time_rem('now', entries)
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
241 avr_first_time = time_rem('first_time', entries)
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
242 avr_comms_time = time_rem('comms_time', entries)
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
243 time_step = float(entries['time_step'])
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
244
400
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
245 debugf.write('now %f, comms_time %f, first_time %f, delta %f\n' %
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
246 (avr_now, avr_comms_time, avr_first_time, avr_now - avr_comms_time))
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
247
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
248 if 'avrtemp' in entries:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
249 avrtemp = val_scale(int(entries['avrtemp']))
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
250 sensor_update('avrtemp', [avrtemp], time.time(), 1)
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
251
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
252 if 'voltage' in entries:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
253 voltage = 0.001 * int(entries['voltage'])
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
254 sensor_update('voltage', [voltage], time.time(), 1)
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
255
425
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
256 if 'fridge_status' in entries:
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
257 fridge_on = int(entries['fridge_status'])
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
258 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
259
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
260 if 'fridge' in entries:
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
261 fridge_setpoint = float(entries['fridge'])
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
262 sensor_update('fridge_setpoint', [fridge_setpoint], time.time(), 1)
346
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
263 #sqlite
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
264 # - time
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
265 # - voltage
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
266 # - boot time
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
267
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
268 first_real_time = time.time() - (avr_now - avr_first_time)
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
269
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
270 for sensor_id, measurements in zip(sensors, meas):
346
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
271 # XXX sqlite add
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
272 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
273
410
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
274 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
275 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
276 debugf.flush()