annotate web/log.py @ 516:a976793021d2

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