Mercurial > templog
annotate web/log.py @ 639:89818a14648b rust tip
- switch to using anyhow for errors, surf for http
runs but surf has problems
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 28 Nov 2019 23:57:00 +0800 |
| parents | 6c14e0573f50 |
| children | 61269311ed3d |
| rev | line source |
|---|---|
| 78 | 1 # -*- coding: utf-8 -*- |
|
37
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
2 #:vim:et:ts=4:sts=4:sw=4: |
| 27 | 3 import rrdtool |
| 4 import os | |
| 29 | 5 import os.path |
| 27 | 6 import sys |
| 29 | 7 import glob |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
8 import hashlib |
|
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
9 import tempfile |
|
37
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
10 import time |
|
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
11 import syslog |
| 44 | 12 import sqlite3 |
|
49
206294a354a7
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
45
diff
changeset
|
13 import traceback |
| 67 | 14 import datetime |
|
75
ca08442635ca
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
73
diff
changeset
|
15 import struct |
| 77 | 16 import binascii |
|
159
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
17 import json |
| 194 | 18 import subprocess |
| 29 | 19 from colorsys import hls_to_rgb |
| 27 | 20 |
| 28 | 21 import config |
| 191 | 22 import atomicfile |
|
253
0a1b642e3086
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
227
diff
changeset
|
23 import settings |
|
0a1b642e3086
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
227
diff
changeset
|
24 |
|
0a1b642e3086
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
227
diff
changeset
|
25 fridge_settings = settings.Settings() |
| 27 | 26 |
| 27 def sensor_rrd_path(s): | |
|
159
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
28 return '%s/sensor_%s.rrd' % (config.DATA_PATH, str(s)) |
| 27 | 29 |
| 29 | 30 # returns (path, sensor_name) tuples |
| 31 def all_sensors(): | |
| 32 return [(r, os.path.basename(r[:-4])) | |
| 33 for r in glob.glob('%s/*.rrd' % config.DATA_PATH)] | |
| 34 | |
| 27 | 35 def create_rrd(sensor_id): |
|
43
ea99aae87884
Create with a start date so that it works
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
36 # start date of 10 seconds into 1970 is used so that we can |
|
ea99aae87884
Create with a start date so that it works
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
37 # update with prior values straight away. |
| 61 | 38 if 'voltage' in sensor_id: |
| 63 | 39 args = [ |
| 40 '--step', '3600', | |
| 41 'DS:temp:GAUGE:7200:1:10', | |
| 42 'RRA:AVERAGE:0.5:1:87600'] | |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
43 elif 'fridge_on' in sensor_id: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
44 args = [ |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
45 '--step', '300', |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
46 'DS:temp:GAUGE:600:-100:500', |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
47 'RRA:LAST:0.5:1:1051200'] |
| 61 | 48 else: |
| 63 | 49 args = [ |
| 50 '--step', '300', | |
|
88
6f4497a448e8
increase temperature logging range
Matt Johnston <matt@ucc.asn.au>
parents:
78
diff
changeset
|
51 'DS:temp:GAUGE:600:-100:500', |
| 61 | 52 'RRA:AVERAGE:0.5:1:1051200'] |
| 27 | 53 |
| 61 | 54 rrdtool.create(sensor_rrd_path(sensor_id), |
| 63 | 55 '--start', 'now-60d', |
| 61 | 56 *args) |
| 29 | 57 |
| 58 # stolen from viewmtn, stolen from monotone-viz | |
| 59 def colour_from_string(str): | |
| 60 def f(off): | |
| 61 return ord(hashval[off]) / 256.0 | |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
62 hashval = hashlib.sha1(str).digest() |
| 29 | 63 hue = f(5) |
| 64 li = f(1) * 0.15 + 0.55 | |
| 65 sat = f(2) * 0.5 + .5 | |
| 66 return ''.join(["%.2x" % int(x * 256) for x in hls_to_rgb(hue, li, sat)]) | |
| 67 | |
| 68 def graph_png(start, length): | |
|
104
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
69 os.environ['MATT_PNG_BODGE_COMPRESS'] = '4' |
|
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
70 os.environ['MATT_PNG_BODGE_FILTER'] = 'paeth' |
| 29 | 71 rrds = all_sensors() |
| 72 | |
| 73 graph_args = [] | |
| 61 | 74 have_volts = False |
|
164
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
75 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
76 ## volts = temp * volts_div + volts_shift |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
77 #volts_div = 10 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
78 #volts_shift = 2 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
79 volts_div = 1 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
80 volts_shift = 0 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
81 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
82 volts_mult = 1.0/volts_div |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
83 |
| 179 | 84 # (title, sensorline) pairs. |
| 85 sensor_lines = [] | |
| 86 | |
|
207
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
87 wort_sensor = None |
|
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
88 fridge_sensor = None |
| 29 | 89 for n, (rrdfile, sensor) in enumerate(rrds): |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
90 unit = None |
| 61 | 91 if 'avrtemp' in sensor: |
| 92 continue | |
| 93 if 'voltage' in sensor: | |
| 94 have_volts = True | |
| 95 vname = 'scalevolts' | |
|
71
7d243ba2dd39
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
69
diff
changeset
|
96 graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals()) |
| 78 | 97 unit = 'V' |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
98 elif 'fridge_on' in sensor: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
99 vname = 'fridge_on' |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
100 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:LAST' % locals()) |
| 131 | 101 graph_args.append('CDEF:%(vname)s=raw%(vname)s,-0.2,*,3,+' % locals()) |
| 61 | 102 else: |
| 103 vname = 'temp%d' % n | |
|
71
7d243ba2dd39
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
69
diff
changeset
|
104 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals()) |
|
101
fd8482365489
limit temps to 35ยบ on graph
Matt Johnston <matt@ucc.asn.au>
parents:
99
diff
changeset
|
105 # limit max temp to 50 |
|
164
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
106 graph_args.append('CDEF:%(vname)s=raw%(vname)s,38,GT,UNKN,raw%(vname)s,%(volts_mult)f,*,%(volts_shift)f,+,IF' % locals()) |
| 78 | 107 unit = '<span face="Liberation Serif">ยบ</span>C' |
| 108 | |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
109 format_last_value = None |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
110 if unit: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
111 try: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
112 last_value = float(rrdtool.info(rrdfile)['ds[temp].last_ds']) |
|
137
d36fe81077cc
strip multiple-of-ten temperatures correctly
Matt Johnston <matt@ucc.asn.au>
parents:
131
diff
changeset
|
113 format_last_value = ('%f' % last_value).rstrip('0').rstrip('.') + unit |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
114 except ValueError: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
115 pass |
| 29 | 116 width = config.LINE_WIDTH |
| 117 legend = config.SENSOR_NAMES.get(sensor, sensor) | |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
118 colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor)) |
|
227
efb5cad2e98b
Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents:
211
diff
changeset
|
119 print_legend = '' |
|
efb5cad2e98b
Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents:
211
diff
changeset
|
120 if legend in config.LEGEND_NAMES: |
|
efb5cad2e98b
Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents:
211
diff
changeset
|
121 if format_last_value: |
|
efb5cad2e98b
Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents:
211
diff
changeset
|
122 print_legend = ':%s (%s)' % (legend, format_last_value) |
|
efb5cad2e98b
Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents:
211
diff
changeset
|
123 else: |
|
efb5cad2e98b
Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents:
211
diff
changeset
|
124 print_legend = ":%s" % legend |
|
efb5cad2e98b
Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents:
211
diff
changeset
|
125 sensor_lines.append( (legend, 'LINE%(width)f:%(vname)s#%(colour)s%(print_legend)s' % locals()) ) |
|
207
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
126 if legend == 'Wort': |
|
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
127 wort_sensor = vname |
|
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
128 elif legend == 'Fridge': |
|
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
129 fridge_sensor = vname |
| 179 | 130 |
|
207
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
131 # calculated bits |
|
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
132 colour = '000000' |
|
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
133 graph_args.append('CDEF:wortdel=%(wort_sensor)s,PREV(%(wort_sensor)s),-' % locals()) |
|
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
134 graph_args.append('CDEF:tempdel=%(wort_sensor)s,%(fridge_sensor)s,-' % locals()) |
|
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
135 graph_args.append('CDEF:fermheat=wortdel,80,*,tempdel,0.9,*,+' % locals()) |
|
210
3f403e22c2e3
improved layering of sensor lines
Matt Johnston <matt@ucc.asn.au>
parents:
207
diff
changeset
|
136 graph_args.append('CDEF:trendfermheat=fermheat,7200,TRENDNAN' % locals()) |
|
207
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
137 graph_args.append('CDEF:limitfermheat=trendfermheat,5,+,11,MIN,2,MAX' % locals()) |
|
227
efb5cad2e98b
Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents:
211
diff
changeset
|
138 graph_args.append('LINE0.5:limitfermheat#%(colour)s' % locals()) |
|
207
9c2de3f977e4
- fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents:
200
diff
changeset
|
139 |
|
210
3f403e22c2e3
improved layering of sensor lines
Matt Johnston <matt@ucc.asn.au>
parents:
207
diff
changeset
|
140 # lines are done afterwards so they can be layered |
|
3f403e22c2e3
improved layering of sensor lines
Matt Johnston <matt@ucc.asn.au>
parents:
207
diff
changeset
|
141 sensor_lines.sort(key = lambda (legend, line): "Wort" in legend) |
|
3f403e22c2e3
improved layering of sensor lines
Matt Johnston <matt@ucc.asn.au>
parents:
207
diff
changeset
|
142 graph_args += (line for (legend, line) in sensor_lines) |
|
3f403e22c2e3
improved layering of sensor lines
Matt Johnston <matt@ucc.asn.au>
parents:
207
diff
changeset
|
143 |
|
280
6c14e0573f50
make overshoot_factor floating point
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
144 #print>>sys.stderr, '\n'.join(graph_args) |
|
210
3f403e22c2e3
improved layering of sensor lines
Matt Johnston <matt@ucc.asn.au>
parents:
207
diff
changeset
|
145 |
| 67 | 146 end = int(start+length) |
| 147 start = int(start) | |
| 148 | |
| 29 | 149 tempf = tempfile.NamedTemporaryFile() |
| 67 | 150 dateformat = '%H:%M:%S %Y-%m-%d' |
| 151 watermark = ("Now %s\t" | |
| 152 "Start %s\t" | |
| 153 "End %s" % ( | |
| 154 datetime.datetime.now().strftime(dateformat), | |
| 155 datetime.datetime.fromtimestamp(start).strftime(dateformat), | |
| 156 datetime.datetime.fromtimestamp(end).strftime(dateformat) )) | |
| 157 | |
| 158 args = [tempf.name, '-s', str(start), | |
| 159 '-e', str(end), | |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
160 '-w', str(config.GRAPH_WIDTH), |
|
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
161 '-h', str(config.GRAPH_HEIGHT), |
| 29 | 162 '--slope-mode', |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
163 '--border', '0', |
|
73
0a8639039453
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
71
diff
changeset
|
164 # '--vertical-label', 'Voltage', |
|
164
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
165 '--y-grid', '%(volts_mult)f:1' % locals(), |
|
71
7d243ba2dd39
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
69
diff
changeset
|
166 '--dynamic-labels', |
| 56 | 167 '--grid-dash', '1:0', |
| 77 | 168 '--zoom', str(config.ZOOM), |
| 56 | 169 '--color', 'GRID#00000000', |
| 170 '--color', 'MGRID#aaaaaa', | |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
171 '--color', 'BACK#ffffff', |
| 67 | 172 '--disable-rrdtool-tag', |
| 78 | 173 '--pango-markup', |
| 67 | 174 '--watermark', watermark, |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
175 '--imgformat', 'PNG'] \ |
| 29 | 176 + graph_args |
| 67 | 177 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT] |
| 178 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT] | |
| 61 | 179 if have_volts: |
|
164
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
180 volts_shift_div = volts_div * volts_shift |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
181 args += ['--right-axis', '%(volts_div)f:-%(volts_shift_div)f' % locals(), |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
182 # '--right-axis-format', '%.0lf', |
|
73
0a8639039453
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
71
diff
changeset
|
183 # '--right-axis-label', 'Temperature' |
|
0a8639039453
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
71
diff
changeset
|
184 ] |
| 61 | 185 |
| 191 | 186 #print>>sys.stderr, ' '.join("'%s'" % s for s in args) |
| 29 | 187 rrdtool.graph(*args) |
|
104
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
188 #return tempf |
| 29 | 189 return tempf.read() |
| 190 | |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
191 def validate_value(m): |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
192 if m == 85: |
|
159
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
193 return 'U' |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
194 else: |
|
159
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
195 return '%f' % m |
| 125 | 196 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
197 def sensor_update(sensor_id, measurements): |
| 27 | 198 try: |
| 199 open(sensor_rrd_path(sensor_id)) | |
| 200 except IOError, e: | |
| 201 create_rrd(sensor_id) | |
| 202 | |
|
37
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
203 if measurements: |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
204 values = ['%d:%s' % (t, validate_value(m)) for (t, m) in measurements] |
| 27 | 205 |
|
37
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
206 rrdfile = sensor_rrd_path(sensor_id) |
| 40 | 207 # XXX what to do here when it fails... |
|
49
206294a354a7
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
45
diff
changeset
|
208 for v in values: |
|
206294a354a7
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
45
diff
changeset
|
209 try: |
|
206294a354a7
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
45
diff
changeset
|
210 rrdtool.update(rrdfile, v) |
| 63 | 211 except rrdtool.error, e: |
|
104
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
212 print>>sys.stderr, "Bad rrdtool update '%s': %s" % (v, str(e)) |
|
49
206294a354a7
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
45
diff
changeset
|
213 traceback.print_exc(file=sys.stderr) |
| 33 | 214 |
|
37
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
215 # be paranoid |
|
104
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
216 #f = file(rrdfile) |
|
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
217 #os.fsync(f.fileno()) |
| 27 | 218 |
| 103 | 219 def debug_file(mode='r'): |
| 220 return open('%s/debug.log' % config.DATA_PATH, mode) | |
| 221 | |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
222 def record_debug(params): |
| 103 | 223 f = debug_file('a+') |
|
37
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
224 f.write('===== %s =====\n' % time.strftime('%a, %d %b %Y %H:%M:%S')) |
|
159
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
225 json.dump(params, f, sort_keys=True, indent=4) |
| 33 | 226 f.flush() |
| 227 return f | |
| 228 | |
| 103 | 229 def tail_debug_log(): |
| 230 f = debug_file() | |
| 231 f.seek(0, 2) | |
| 232 size = f.tell() | |
| 233 f.seek(max(0, size-30000)) | |
| 234 return '\n'.join(l.strip() for l in f.readlines()[-400:]) | |
| 235 | |
|
75
ca08442635ca
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
73
diff
changeset
|
236 def convert_ds18b20_12bit(reading): |
|
ca08442635ca
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
73
diff
changeset
|
237 value = struct.unpack('>h', binascii.unhexlify(reading))[0] |
|
ca08442635ca
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
73
diff
changeset
|
238 return value * 0.0625 |
|
ca08442635ca
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
73
diff
changeset
|
239 |
| 94 | 240 def time_rem(name, entries): |
| 241 val_ticks = int(entries[name]) | |
| 95 | 242 val_rem = int(entries['%s_rem' % name]) |
|
99
1a88bb989afb
fix off-by-one in remainder code
Matt Johnston <matt@ucc.asn.au>
parents:
95
diff
changeset
|
243 tick_wake = int(entries['tick_wake']) + 1 |
| 94 | 244 tick_secs = int(entries['tick_secs']) |
| 245 return val_ticks + float(val_rem) * tick_secs / tick_wake | |
| 246 | |
|
258
03e540c3ec24
fix server side long polling
Matt Johnston <matt@ucc.asn.au>
parents:
253
diff
changeset
|
247 def write_current_params(current_params, current_epoch): |
|
03e540c3ec24
fix server side long polling
Matt Johnston <matt@ucc.asn.au>
parents:
253
diff
changeset
|
248 fridge_settings.update(current_params, current_epoch) |
| 191 | 249 |
| 250 def read_current_params(): | |
|
253
0a1b642e3086
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
227
diff
changeset
|
251 params, epochtag = fridge_settings.get() |
|
0a1b642e3086
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
227
diff
changeset
|
252 return params |
| 191 | 253 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
254 def parse(params): |
|
104
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
255 |
|
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
256 start_time = time.time() |
| 33 | 257 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
258 debugf = record_debug(params) |
| 27 | 259 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
260 remote_now = params['now'] |
| 27 | 261 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
262 time_diff = start_time - remote_now |
| 27 | 263 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
264 # readings is [ ({sensorname: value, ...}, time), ... ] |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
265 readings = params['readings'] |
| 27 | 266 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
267 # measurements is {sensorname: [(time, value), ...], ...} |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
268 measurements = {} |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
269 for rs, t in readings: |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
270 real_t = t + time_diff |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
271 for s, v in rs.iteritems(): |
|
159
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
272 measurements.setdefault(s, []).append((real_t, v)) |
| 61 | 273 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
274 # one-off measurements here |
| 191 | 275 current_params = params['current_params'] |
|
253
0a1b642e3086
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
227
diff
changeset
|
276 current_epoch = params['current_params_epoch'] |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
277 measurements['fridge_on'] = [ (time.time(), params['fridge_on']) ] |
| 191 | 278 measurements['fridge_setpoint'] = [ (time.time(), current_params['fridge_setpoint']) ] |
| 279 | |
|
253
0a1b642e3086
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
227
diff
changeset
|
280 write_current_params(current_params, current_epoch) |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
281 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
282 for s, vs in measurements.iteritems(): |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
283 sensor_update(s, vs) |
| 33 | 284 |
|
104
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
285 timedelta = time.time() - start_time |
|
159
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
286 debugf.write("Updated sensors in %.2f secs\n" % timedelta) |
| 33 | 287 debugf.flush() |
| 182 | 288 |
|
280
6c14e0573f50
make overshoot_factor floating point
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
289 # types used here define the type of a field |
| 194 | 290 _FIELD_DEFAULTS = { |
|
200
1d8a8bd2ea78
Fridge setpoint as a float value
Matt Johnston <matt@ucc.asn.au>
parents:
194
diff
changeset
|
291 'fridge_setpoint': 16.0, |
| 194 | 292 'fridge_difference': 0.2, |
| 293 'overshoot_delay': 720, # 12 minutes | |
|
280
6c14e0573f50
make overshoot_factor floating point
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
294 'overshoot_factor': 1.0, # ยบC |
| 194 | 295 'disabled': False, |
| 296 'nowort': True, | |
| 297 'fridge_range_lower': 3, | |
| 298 'fridge_range_upper': 3, | |
| 299 } | |
| 300 | |
| 182 | 301 def get_params(): |
|
280
6c14e0573f50
make overshoot_factor floating point
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
302 """ Can return None if there aren't any parameters yet, |
|
6c14e0573f50
make overshoot_factor floating point
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
303 otherwise returns the parameter list """ |
| 182 | 304 |
| 305 r = [] | |
| 191 | 306 |
| 307 vals = read_current_params() | |
|
280
6c14e0573f50
make overshoot_factor floating point
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
308 if not vals: |
|
6c14e0573f50
make overshoot_factor floating point
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
309 return None |
| 191 | 310 |
| 182 | 311 for k, v in _FIELD_DEFAULTS.iteritems(): |
| 194 | 312 n = {'name': k, 'value': type(v)(vals[k])} |
| 182 | 313 if type(v) is bool: |
| 314 kind = 'yesno' | |
| 315 else: | |
| 316 kind = 'number' | |
|
183
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
317 if k == 'overshoot_delay': |
|
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
318 n['unit'] = ' sec' |
|
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
319 n['amount'] = 60 |
| 184 | 320 n['digits'] = 0; |
|
183
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
321 else: |
|
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
322 n['unit'] = 'ยบ' |
| 184 | 323 n['amount'] = 0.1; |
| 324 n['digits'] = 1; | |
| 182 | 325 n['kind'] = kind |
|
183
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
326 n['title'] = k |
| 182 | 327 r.append(n) |
|
183
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
328 |
| 182 | 329 return json.dumps(r, sort_keys=True, indent=4) |
| 185 | 330 |
| 194 | 331 def send_params(params): |
| 332 # 'templog_receive' is ignored due to authorized_keys | |
|
211
59379b2bd056
key fingerprints are case- and whitespace-insensitive.
Matt Johnston <matt@ucc.asn.au>
parents:
210
diff
changeset
|
333 # restrictions. the rpi has authorized_keys with |
|
59379b2bd056
key fingerprints are case- and whitespace-insensitive.
Matt Johnston <matt@ucc.asn.au>
parents:
210
diff
changeset
|
334 # command="/home/matt/templog/venv/bin/python /home/matt/templog/py/receive.py",no-pty,no-port-forwarding,no-x11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC.... |
| 194 | 335 args = [config.SSH_PROG, '-i', config.SSH_KEYFILE, |
| 336 config.SSH_HOST, 'templog_receive'] | |
| 337 try: | |
| 338 p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE) | |
| 339 (out, err) = p.communicate(json.dumps(params)) | |
| 340 except OSError, e: | |
| 341 print>>sys.stderr, e | |
| 342 return "Failed update" | |
| 185 | 343 |
| 194 | 344 if 'Good Update' in out: |
| 345 return True | |
| 346 | |
| 347 print>>sys.stderr, "Strange return from update:" | |
| 348 print>>sys.stderr, out | |
| 349 return "Unexpected update result" | |
| 350 | |
| 351 def same_type(a, b): | |
| 352 ta = type(a) | |
| 353 tb = type(b) | |
| 354 | |
| 355 if ta == int: | |
| 356 ta = float | |
| 357 if tb == int: | |
| 358 tb = float | |
| 359 | |
| 360 return (ta == tb) | |
| 361 | |
| 362 def update_params(p): | |
| 363 params = {} | |
| 364 for i in p: | |
| 365 params[i['name']] = i['value'] | |
| 366 | |
| 367 if params.viewkeys() != _FIELD_DEFAULTS.viewkeys(): | |
| 368 diff = params.viewkeys() ^ _FIELD_DEFAULTS.viewkeys() | |
| 369 return "Key mismatch, difference %s" % str(diff) | |
| 370 | |
| 371 for k, v in params.items(): | |
| 372 if not same_type(v, _FIELD_DEFAULTS[k]): | |
| 373 return "Bad type for %s, %s vs %s" % (k , type(v), type(_FIELD_DEFAULTS[k])) | |
| 374 | |
|
253
0a1b642e3086
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
227
diff
changeset
|
375 fridge_settings.update(params) |
| 194 | 376 return True |
| 377 | |
| 378 | |
| 379 |