Mercurial > templog
annotate web/log.py @ 498:ccc2915b2dd9
Add --new flag
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 04 Mar 2014 22:12:29 +0800 |
| parents | 23c6cf01d237 |
| children | 1d8a8bd2ea78 |
| 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 |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
17 import json |
| 492 | 18 import subprocess |
| 335 | 19 from colorsys import hls_to_rgb |
| 333 | 20 |
| 334 | 21 import config |
| 489 | 22 import atomicfile |
| 333 | 23 |
| 24 def sensor_rrd_path(s): | |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
25 return '%s/sensor_%s.rrd' % (config.DATA_PATH, str(s)) |
| 333 | 26 |
| 335 | 27 # returns (path, sensor_name) tuples |
| 28 def all_sensors(): | |
| 29 return [(r, os.path.basename(r[:-4])) | |
| 30 for r in glob.glob('%s/*.rrd' % config.DATA_PATH)] | |
| 31 | |
| 333 | 32 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
|
33 # 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
|
34 # update with prior values straight away. |
| 367 | 35 if 'voltage' in sensor_id: |
| 369 | 36 args = [ |
| 37 '--step', '3600', | |
| 38 'DS:temp:GAUGE:7200:1:10', | |
| 39 'RRA:AVERAGE:0.5:1:87600'] | |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
40 elif 'fridge_on' in sensor_id: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
41 args = [ |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
42 '--step', '300', |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
43 'DS:temp:GAUGE:600:-100:500', |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
44 'RRA:LAST:0.5:1:1051200'] |
| 367 | 45 else: |
| 369 | 46 args = [ |
| 47 '--step', '300', | |
|
394
2cd246ea92c6
increase temperature logging range
Matt Johnston <matt@ucc.asn.au>
parents:
384
diff
changeset
|
48 'DS:temp:GAUGE:600:-100:500', |
| 367 | 49 'RRA:AVERAGE:0.5:1:1051200'] |
| 333 | 50 |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
51 print>>sys.stderr, sensor_rrd_path(sensor_id) |
|
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
52 |
| 367 | 53 rrdtool.create(sensor_rrd_path(sensor_id), |
| 369 | 54 '--start', 'now-60d', |
| 367 | 55 *args) |
| 335 | 56 |
| 57 # stolen from viewmtn, stolen from monotone-viz | |
| 58 def colour_from_string(str): | |
| 59 def f(off): | |
| 60 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
|
61 hashval = hashlib.sha1(str).digest() |
| 335 | 62 hue = f(5) |
| 63 li = f(1) * 0.15 + 0.55 | |
| 64 sat = f(2) * 0.5 + .5 | |
| 65 return ''.join(["%.2x" % int(x * 256) for x in hls_to_rgb(hue, li, sat)]) | |
| 66 | |
| 67 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
|
68 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
|
69 os.environ['MATT_PNG_BODGE_FILTER'] = 'paeth' |
| 335 | 70 rrds = all_sensors() |
| 71 | |
| 72 graph_args = [] | |
| 367 | 73 have_volts = False |
|
464
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
74 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
75 ## volts = temp * volts_div + volts_shift |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
76 #volts_div = 10 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
77 #volts_shift = 2 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
78 volts_div = 1 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
79 volts_shift = 0 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
80 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
81 volts_mult = 1.0/volts_div |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
82 |
| 478 | 83 # (title, sensorline) pairs. |
| 84 sensor_lines = [] | |
| 85 | |
| 335 | 86 for n, (rrdfile, sensor) in enumerate(rrds): |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
87 unit = None |
| 367 | 88 if 'avrtemp' in sensor: |
| 89 continue | |
| 90 if 'voltage' in sensor: | |
| 91 have_volts = True | |
| 92 vname = 'scalevolts' | |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
93 graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals()) |
| 384 | 94 unit = 'V' |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
95 elif 'fridge_on' in sensor: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
96 vname = 'fridge_on' |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
97 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:LAST' % locals()) |
| 431 | 98 graph_args.append('CDEF:%(vname)s=raw%(vname)s,-0.2,*,3,+' % locals()) |
| 367 | 99 else: |
| 100 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
|
101 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
|
102 # limit max temp to 50 |
|
464
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
103 graph_args.append('CDEF:%(vname)s=raw%(vname)s,38,GT,UNKN,raw%(vname)s,%(volts_mult)f,*,%(volts_shift)f,+,IF' % locals()) |
| 384 | 104 unit = '<span face="Liberation Serif">ยบ</span>C' |
| 105 | |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
106 format_last_value = None |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
107 if unit: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
108 try: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
109 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
|
110 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
|
111 except ValueError: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
112 pass |
| 335 | 113 width = config.LINE_WIDTH |
| 114 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
|
115 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
|
116 if format_last_value: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
117 print_legend = '%s (%s)' % (legend, format_last_value) |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
118 else: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
119 print_legend = legend |
| 478 | 120 sensor_lines.append( (legend, 'LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals()) ) |
| 121 | |
| 122 sensor_lines.sort(key = lambda (legend, line): "Wort" in legend) | |
| 123 | |
| 124 graph_args += (line for (legend, line) in sensor_lines) | |
| 335 | 125 |
| 373 | 126 end = int(start+length) |
| 127 start = int(start) | |
| 128 | |
| 335 | 129 tempf = tempfile.NamedTemporaryFile() |
| 373 | 130 dateformat = '%H:%M:%S %Y-%m-%d' |
| 131 watermark = ("Now %s\t" | |
| 132 "Start %s\t" | |
| 133 "End %s" % ( | |
| 134 datetime.datetime.now().strftime(dateformat), | |
| 135 datetime.datetime.fromtimestamp(start).strftime(dateformat), | |
| 136 datetime.datetime.fromtimestamp(end).strftime(dateformat) )) | |
| 137 | |
| 138 args = [tempf.name, '-s', str(start), | |
| 139 '-e', str(end), | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
140 '-w', str(config.GRAPH_WIDTH), |
|
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
141 '-h', str(config.GRAPH_HEIGHT), |
| 335 | 142 '--slope-mode', |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
143 '--border', '0', |
|
379
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
144 # '--vertical-label', 'Voltage', |
|
464
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
145 '--y-grid', '%(volts_mult)f:1' % locals(), |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
146 '--dynamic-labels', |
| 362 | 147 '--grid-dash', '1:0', |
| 383 | 148 '--zoom', str(config.ZOOM), |
| 362 | 149 '--color', 'GRID#00000000', |
| 150 '--color', 'MGRID#aaaaaa', | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
151 '--color', 'BACK#ffffff', |
| 373 | 152 '--disable-rrdtool-tag', |
| 384 | 153 '--pango-markup', |
| 373 | 154 '--watermark', watermark, |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
155 '--imgformat', 'PNG'] \ |
| 335 | 156 + graph_args |
| 373 | 157 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT] |
| 158 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT] | |
| 367 | 159 if have_volts: |
|
464
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
160 volts_shift_div = volts_div * volts_shift |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
161 args += ['--right-axis', '%(volts_div)f:-%(volts_shift_div)f' % locals(), |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
162 # '--right-axis-format', '%.0lf', |
|
379
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
163 # '--right-axis-label', 'Temperature' |
|
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
164 ] |
| 367 | 165 |
| 489 | 166 #print>>sys.stderr, ' '.join("'%s'" % s for s in args) |
| 335 | 167 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
|
168 #return tempf |
| 335 | 169 return tempf.read() |
| 170 | |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
171 def validate_value(m): |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
172 if m == 85: |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
173 return 'U' |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
174 else: |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
175 return '%f' % m |
| 424 | 176 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
177 def sensor_update(sensor_id, measurements): |
| 333 | 178 try: |
| 179 open(sensor_rrd_path(sensor_id)) | |
| 180 except IOError, e: | |
| 181 create_rrd(sensor_id) | |
| 182 | |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
183 if measurements: |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
184 values = ['%d:%s' % (t, validate_value(m)) for (t, m) in measurements] |
| 333 | 185 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
186 rrdfile = sensor_rrd_path(sensor_id) |
| 346 | 187 # 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
|
188 for v in values: |
|
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
189 try: |
|
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
190 rrdtool.update(rrdfile, v) |
| 369 | 191 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
|
192 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
|
193 traceback.print_exc(file=sys.stderr) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
194 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
195 # be paranoid |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
196 #f = file(rrdfile) |
|
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
197 #os.fsync(f.fileno()) |
| 333 | 198 |
| 409 | 199 def debug_file(mode='r'): |
| 200 return open('%s/debug.log' % config.DATA_PATH, mode) | |
| 201 | |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
202 def record_debug(params): |
| 409 | 203 f = debug_file('a+') |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
204 f.write('===== %s =====\n' % time.strftime('%a, %d %b %Y %H:%M:%S')) |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
205 json.dump(params, f, sort_keys=True, indent=4) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
206 f.flush() |
|
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
207 return f |
|
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
208 |
| 409 | 209 def tail_debug_log(): |
| 210 f = debug_file() | |
| 211 f.seek(0, 2) | |
| 212 size = f.tell() | |
| 213 f.seek(max(0, size-30000)) | |
| 214 return '\n'.join(l.strip() for l in f.readlines()[-400:]) | |
| 215 | |
|
381
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
216 def convert_ds18b20_12bit(reading): |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
217 value = struct.unpack('>h', binascii.unhexlify(reading))[0] |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
218 return value * 0.0625 |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
219 |
| 400 | 220 def time_rem(name, entries): |
| 221 val_ticks = int(entries[name]) | |
| 401 | 222 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
|
223 tick_wake = int(entries['tick_wake']) + 1 |
| 400 | 224 tick_secs = int(entries['tick_secs']) |
| 225 return val_ticks + float(val_rem) * tick_secs / tick_wake | |
| 226 | |
| 489 | 227 def write_current_params(current_params): |
| 228 out = {} | |
| 229 out['params'] = current_params | |
| 230 out['time'] = time.time() | |
| 231 atomicfile.AtomicFile("%s/current_params.txt" % config.DATA_PATH).write( | |
| 232 json.dumps(out, sort_keys=True, indent=4)+'\n') | |
| 233 | |
| 234 def read_current_params(): | |
| 235 p = atomicfile.AtomicFile("%s/current_params.txt" % config.DATA_PATH).read() | |
| 236 dat = json.loads(p) | |
| 237 return dat['params'] | |
| 238 | |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
239 def parse(params): |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
240 |
|
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
241 start_time = time.time() |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
242 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
243 debugf = record_debug(params) |
| 333 | 244 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
245 remote_now = params['now'] |
| 333 | 246 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
247 time_diff = start_time - remote_now |
| 333 | 248 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
249 # readings is [ ({sensorname: value, ...}, time), ... ] |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
250 readings = params['readings'] |
| 333 | 251 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
252 # measurements is {sensorname: [(time, value), ...], ...} |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
253 measurements = {} |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
254 for rs, t in readings: |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
255 real_t = t + time_diff |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
256 for s, v in rs.iteritems(): |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
257 measurements.setdefault(s, []).append((real_t, v)) |
| 367 | 258 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
259 # one-off measurements here |
| 489 | 260 current_params = params['current_params'] |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
261 measurements['fridge_on'] = [ (time.time(), params['fridge_on']) ] |
| 489 | 262 measurements['fridge_setpoint'] = [ (time.time(), current_params['fridge_setpoint']) ] |
| 263 | |
| 264 write_current_params(current_params) | |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
265 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
266 for s, vs in measurements.iteritems(): |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
267 sensor_update(s, vs) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
268 |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
269 timedelta = time.time() - start_time |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
270 debugf.write("Updated sensors in %.2f secs\n" % timedelta) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
271 debugf.flush() |
| 482 | 272 |
| 492 | 273 _FIELD_DEFAULTS = { |
| 274 'fridge_setpoint': 16, | |
| 275 'fridge_difference': 0.2, | |
| 276 'overshoot_delay': 720, # 12 minutes | |
| 277 'overshoot_factor': 1, # ยบC | |
| 278 'disabled': False, | |
| 279 'nowort': True, | |
| 280 'fridge_range_lower': 3, | |
| 281 'fridge_range_upper': 3, | |
| 282 } | |
| 283 | |
| 482 | 284 def get_params(): |
| 285 | |
| 286 r = [] | |
| 489 | 287 |
| 288 vals = read_current_params() | |
| 289 | |
| 482 | 290 for k, v in _FIELD_DEFAULTS.iteritems(): |
| 492 | 291 n = {'name': k, 'value': type(v)(vals[k])} |
| 482 | 292 if type(v) is bool: |
| 293 kind = 'yesno' | |
| 294 else: | |
| 295 kind = 'number' | |
|
483
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
296 if k == 'overshoot_delay': |
|
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
297 n['unit'] = ' sec' |
|
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
298 n['amount'] = 60 |
| 484 | 299 n['digits'] = 0; |
|
483
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
300 else: |
|
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
301 n['unit'] = 'ยบ' |
| 484 | 302 n['amount'] = 0.1; |
| 303 n['digits'] = 1; | |
| 482 | 304 n['kind'] = kind |
|
483
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
305 n['title'] = k |
| 482 | 306 r.append(n) |
|
483
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
307 |
| 482 | 308 return json.dumps(r, sort_keys=True, indent=4) |
| 485 | 309 |
| 492 | 310 def send_params(params): |
| 311 # 'templog_receive' is ignored due to authorized_keys | |
| 312 # restrictions | |
| 313 args = [config.SSH_PROG, '-i', config.SSH_KEYFILE, | |
| 314 config.SSH_HOST, 'templog_receive'] | |
| 315 try: | |
| 316 p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE) | |
| 317 (out, err) = p.communicate(json.dumps(params)) | |
| 318 except OSError, e: | |
| 319 print>>sys.stderr, e | |
| 320 return "Failed update" | |
| 485 | 321 |
| 492 | 322 if 'Good Update' in out: |
| 323 return True | |
| 324 | |
| 325 print>>sys.stderr, "Strange return from update:" | |
| 326 print>>sys.stderr, out | |
| 327 return "Unexpected update result" | |
| 328 | |
| 329 def same_type(a, b): | |
| 330 ta = type(a) | |
| 331 tb = type(b) | |
| 332 | |
| 333 if ta == int: | |
| 334 ta = float | |
| 335 if tb == int: | |
| 336 tb = float | |
| 337 | |
| 338 return (ta == tb) | |
| 339 | |
| 340 def update_params(p): | |
| 341 params = {} | |
| 342 for i in p: | |
| 343 params[i['name']] = i['value'] | |
| 344 | |
| 345 if params.viewkeys() != _FIELD_DEFAULTS.viewkeys(): | |
| 346 diff = params.viewkeys() ^ _FIELD_DEFAULTS.viewkeys() | |
| 347 return "Key mismatch, difference %s" % str(diff) | |
| 348 | |
| 349 for k, v in params.items(): | |
| 350 if not same_type(v, _FIELD_DEFAULTS[k]): | |
| 351 return "Bad type for %s, %s vs %s" % (k , type(v), type(_FIELD_DEFAULTS[k])) | |
| 352 | |
| 353 ret = send_params(params) | |
| 354 if ret is not True: | |
| 355 return "Failed sending params: %s" % ret | |
| 356 | |
| 357 return True | |
| 358 | |
| 359 | |
| 360 |