annotate web/log.py @ 260:6fb9d5f654ff

increase waiter timeout
author Matt Johnston <matt@ucc.asn.au>
date Tue, 09 Jun 2015 23:37:49 +0800
parents 0a1b642e3086
children 03e540c3ec24
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
78
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
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
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
3 import rrdtool
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
4 import os
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
5 import os.path
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
6 import sys
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
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
96c336896201 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
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
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
14 import datetime
75
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
15 import struct
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
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
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
18 import subprocess
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
19 from colorsys import hls_to_rgb
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
20
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
21 import config
191
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
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
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
26
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
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
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
29
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
30 # returns (path, sensor_name) tuples
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
31 def all_sensors():
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
32 return [(r, os.path.basename(r[:-4]))
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
33 for r in glob.glob('%s/*.rrd' % config.DATA_PATH)]
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
34
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
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
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
38 if 'voltage' in sensor_id:
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
39 args = [
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
40 '--step', '3600',
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
41 'DS:temp:GAUGE:7200:1:10',
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
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
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
48 else:
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
49 args = [
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
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
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
52 'RRA:AVERAGE:0.5:1:1051200']
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
53
159
683cfd134f6a Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
54 print>>sys.stderr, sensor_rrd_path(sensor_id)
683cfd134f6a Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
55
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
56 rrdtool.create(sensor_rrd_path(sensor_id),
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
57 '--start', 'now-60d',
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
58 *args)
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
59
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
60 # stolen from viewmtn, stolen from monotone-viz
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
61 def colour_from_string(str):
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
62 def f(off):
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
63 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
64 hashval = hashlib.sha1(str).digest()
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
65 hue = f(5)
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
66 li = f(1) * 0.15 + 0.55
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
67 sat = f(2) * 0.5 + .5
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
68 return ''.join(["%.2x" % int(x * 256) for x in hls_to_rgb(hue, li, sat)])
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
69
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
70 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
71 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
72 os.environ['MATT_PNG_BODGE_FILTER'] = 'paeth'
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
73 rrds = all_sensors()
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
74
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
75 graph_args = []
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
76 have_volts = False
164
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
77
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
78 ## volts = temp * volts_div + volts_shift
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
79 #volts_div = 10
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
80 #volts_shift = 2
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
81 volts_div = 1
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
82 volts_shift = 0
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
83
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
84 volts_mult = 1.0/volts_div
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
85
179
30390852cb5d sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 164
diff changeset
86 # (title, sensorline) pairs.
30390852cb5d sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 164
diff changeset
87 sensor_lines = []
30390852cb5d sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 164
diff changeset
88
207
9c2de3f977e4 - fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents: 200
diff changeset
89 wort_sensor = None
9c2de3f977e4 - fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents: 200
diff changeset
90 fridge_sensor = None
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
91 for n, (rrdfile, sensor) in enumerate(rrds):
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
92 unit = None
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
93 if 'avrtemp' in sensor:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
94 continue
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
95 if 'voltage' in sensor:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
96 have_volts = True
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
97 vname = 'scalevolts'
71
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
98 graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals())
78
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
99 unit = 'V'
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
100 elif 'fridge_on' in sensor:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
101 vname = 'fridge_on'
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
102 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:LAST' % locals())
131
719d5669ab27 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 126
diff changeset
103 graph_args.append('CDEF:%(vname)s=raw%(vname)s,-0.2,*,3,+' % locals())
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
104 else:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
105 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
106 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
107 # limit max temp to 50
164
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
108 graph_args.append('CDEF:%(vname)s=raw%(vname)s,38,GT,UNKN,raw%(vname)s,%(volts_mult)f,*,%(volts_shift)f,+,IF' % locals())
78
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
109 unit = '<span face="Liberation Serif">ยบ</span>C'
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
110
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
111 format_last_value = None
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
112 if unit:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
113 try:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
114 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
115 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
116 except ValueError:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
117 pass
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
118 width = config.LINE_WIDTH
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
119 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
120 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
121 print_legend = ''
efb5cad2e98b Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents: 211
diff changeset
122 if legend in config.LEGEND_NAMES:
efb5cad2e98b Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents: 211
diff changeset
123 if format_last_value:
efb5cad2e98b Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents: 211
diff changeset
124 print_legend = ':%s (%s)' % (legend, format_last_value)
efb5cad2e98b Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents: 211
diff changeset
125 else:
efb5cad2e98b Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents: 211
diff changeset
126 print_legend = ":%s" % legend
efb5cad2e98b Only print interesting legend labels
Matt Johnston <matt@ucc.asn.au>
parents: 211
diff changeset
127 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
128 if legend == 'Wort':
9c2de3f977e4 - fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents: 200
diff changeset
129 wort_sensor = vname
9c2de3f977e4 - fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents: 200
diff changeset
130 elif legend == 'Fridge':
9c2de3f977e4 - fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents: 200
diff changeset
131 fridge_sensor = vname
179
30390852cb5d sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 164
diff changeset
132
207
9c2de3f977e4 - fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents: 200
diff changeset
133 # calculated bits
9c2de3f977e4 - fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents: 200
diff changeset
134 colour = '000000'
9c2de3f977e4 - fermentation heat prediction kind of works?
Matt Johnston <matt@ucc.asn.au>
parents: 200
diff changeset
135 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
136 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
137 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
138 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
139 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
140 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
141
210
3f403e22c2e3 improved layering of sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 207
diff changeset
142 # 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
143 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
144 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
145
3f403e22c2e3 improved layering of sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 207
diff changeset
146 print>>sys.stderr, '\n'.join(graph_args)
3f403e22c2e3 improved layering of sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 207
diff changeset
147
3f403e22c2e3 improved layering of sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 207
diff changeset
148
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
149 end = int(start+length)
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
150 start = int(start)
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
151
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
152 tempf = tempfile.NamedTemporaryFile()
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
153 dateformat = '%H:%M:%S %Y-%m-%d'
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
154 watermark = ("Now %s\t"
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
155 "Start %s\t"
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
156 "End %s" % (
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
157 datetime.datetime.now().strftime(dateformat),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
158 datetime.datetime.fromtimestamp(start).strftime(dateformat),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
159 datetime.datetime.fromtimestamp(end).strftime(dateformat) ))
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
160
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
161 args = [tempf.name, '-s', str(start),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
162 '-e', str(end),
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
163 '-w', str(config.GRAPH_WIDTH),
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
164 '-h', str(config.GRAPH_HEIGHT),
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
165 '--slope-mode',
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
166 '--border', '0',
73
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
167 # '--vertical-label', 'Voltage',
164
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
168 '--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
169 '--dynamic-labels',
56
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
170 '--grid-dash', '1:0',
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
171 '--zoom', str(config.ZOOM),
56
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
172 '--color', 'GRID#00000000',
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
173 '--color', 'MGRID#aaaaaa',
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
174 '--color', 'BACK#ffffff',
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
175 '--disable-rrdtool-tag',
78
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
176 '--pango-markup',
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
177 '--watermark', watermark,
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
178 '--imgformat', 'PNG'] \
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
179 + graph_args
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
180 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT]
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
181 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT]
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
182 if have_volts:
164
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
183 volts_shift_div = volts_div * volts_shift
632d436d227b LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 159
diff changeset
184 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
185 # '--right-axis-format', '%.0lf',
73
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
186 # '--right-axis-label', 'Temperature'
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
187 ]
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
188
191
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
189 #print>>sys.stderr, ' '.join("'%s'" % s for s in args)
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
190 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
191 #return tempf
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
192 return tempf.read()
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
193
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
194 def validate_value(m):
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
195 if m == 85:
159
683cfd134f6a Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
196 return 'U'
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
197 else:
159
683cfd134f6a Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
198 return '%f' % m
125
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
199
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
200 def sensor_update(sensor_id, measurements):
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
201 try:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
202 open(sensor_rrd_path(sensor_id))
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
203 except IOError, e:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
204 create_rrd(sensor_id)
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
205
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
206 if measurements:
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
207 values = ['%d:%s' % (t, validate_value(m)) for (t, m) in measurements]
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
208
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
209 rrdfile = sensor_rrd_path(sensor_id)
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
210 # 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
211 for v in values:
206294a354a7 update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 45
diff changeset
212 try:
206294a354a7 update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 45
diff changeset
213 rrdtool.update(rrdfile, v)
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
214 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
215 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
216 traceback.print_exc(file=sys.stderr)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
217
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
218 # be paranoid
104
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
219 #f = file(rrdfile)
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
220 #os.fsync(f.fileno())
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
221
103
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
222 def debug_file(mode='r'):
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
223 return open('%s/debug.log' % config.DATA_PATH, mode)
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
224
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
225 def record_debug(params):
103
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
226 f = debug_file('a+')
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
227 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
228 json.dump(params, f, sort_keys=True, indent=4)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
229 f.flush()
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
230 return f
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
231
103
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
232 def tail_debug_log():
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
233 f = debug_file()
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
234 f.seek(0, 2)
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
235 size = f.tell()
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
236 f.seek(max(0, size-30000))
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
237 return '\n'.join(l.strip() for l in f.readlines()[-400:])
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
238
75
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
239 def convert_ds18b20_12bit(reading):
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
240 value = struct.unpack('>h', binascii.unhexlify(reading))[0]
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
241 return value * 0.0625
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
242
94
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
243 def time_rem(name, entries):
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
244 val_ticks = int(entries[name])
95
fd9cfa6829fd fix rem calculation
Matt Johnston <matt@ucc.asn.au>
parents: 94
diff changeset
245 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
246 tick_wake = int(entries['tick_wake']) + 1
94
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
247 tick_secs = int(entries['tick_secs'])
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
248 return val_ticks + float(val_rem) * tick_secs / tick_wake
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
249
191
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
250 def write_current_params(current_params):
253
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 227
diff changeset
251 fridge_settings.update(current_params)
191
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
252
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
253 def read_current_params():
253
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 227
diff changeset
254 params, epochtag = fridge_settings.get()
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 227
diff changeset
255 return params
191
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
256
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
257 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
258
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
259 start_time = time.time()
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
260
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
261 debugf = record_debug(params)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
262
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
263 remote_now = params['now']
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
264
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
265 time_diff = start_time - remote_now
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
266
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
267 # readings is [ ({sensorname: value, ...}, time), ... ]
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
268 readings = params['readings']
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
269
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
270 # measurements is {sensorname: [(time, value), ...], ...}
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
271 measurements = {}
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
272 for rs, t in readings:
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
273 real_t = t + time_diff
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
274 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
275 measurements.setdefault(s, []).append((real_t, v))
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
276
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
277 # one-off measurements here
191
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
278 current_params = params['current_params']
253
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 227
diff changeset
279 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
280 measurements['fridge_on'] = [ (time.time(), params['fridge_on']) ]
191
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
281 measurements['fridge_setpoint'] = [ (time.time(), current_params['fridge_setpoint']) ]
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
282
253
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 227
diff changeset
283 write_current_params(current_params, current_epoch)
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
284
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
285 for s, vs in measurements.iteritems():
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
286 sensor_update(s, vs)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
287
104
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
288 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
289 debugf.write("Updated sensors in %.2f secs\n" % timedelta)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
290 debugf.flush()
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
291
194
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
292 _FIELD_DEFAULTS = {
200
1d8a8bd2ea78 Fridge setpoint as a float value
Matt Johnston <matt@ucc.asn.au>
parents: 194
diff changeset
293 'fridge_setpoint': 16.0,
194
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
294 'fridge_difference': 0.2,
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
295 'overshoot_delay': 720, # 12 minutes
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
296 'overshoot_factor': 1, # ยบC
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
297 'disabled': False,
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
298 'nowort': True,
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
299 'fridge_range_lower': 3,
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
300 'fridge_range_upper': 3,
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
301 }
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
302
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
303 def get_params():
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
304
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
305 r = []
191
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
306
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
307 vals = read_current_params()
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
308
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
309 for k, v in _FIELD_DEFAULTS.iteritems():
194
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
310 n = {'name': k, 'value': type(v)(vals[k])}
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
311 if type(v) is bool:
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
312 kind = 'yesno'
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
313 else:
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
314 kind = 'number'
183
177f616893e6 param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
315 if k == 'overshoot_delay':
177f616893e6 param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
316 n['unit'] = ' sec'
177f616893e6 param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
317 n['amount'] = 60
184
cbe14244a372 a few fixes
Matt Johnston <matt@ucc.asn.au>
parents: 183
diff changeset
318 n['digits'] = 0;
183
177f616893e6 param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
319 else:
177f616893e6 param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
320 n['unit'] = 'ยบ'
184
cbe14244a372 a few fixes
Matt Johnston <matt@ucc.asn.au>
parents: 183
diff changeset
321 n['amount'] = 0.1;
cbe14244a372 a few fixes
Matt Johnston <matt@ucc.asn.au>
parents: 183
diff changeset
322 n['digits'] = 1;
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
323 n['kind'] = kind
183
177f616893e6 param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
324 n['title'] = k
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
325 r.append(n)
183
177f616893e6 param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
326
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 179
diff changeset
327 return json.dumps(r, sort_keys=True, indent=4)
185
adbf70d1449f working
Matt Johnston <matt@ucc.asn.au>
parents: 184
diff changeset
328
194
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
329 def send_params(params):
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
330 # '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
331 # 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
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....
194
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
333 args = [config.SSH_PROG, '-i', config.SSH_KEYFILE,
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
334 config.SSH_HOST, 'templog_receive']
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
335 try:
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
336 p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
337 (out, err) = p.communicate(json.dumps(params))
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
338 except OSError, e:
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
339 print>>sys.stderr, e
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
340 return "Failed update"
185
adbf70d1449f working
Matt Johnston <matt@ucc.asn.au>
parents: 184
diff changeset
341
194
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
342 if 'Good Update' in out:
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
343 return True
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
344
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
345 print>>sys.stderr, "Strange return from update:"
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
346 print>>sys.stderr, out
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
347 return "Unexpected update result"
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
348
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
349 def same_type(a, b):
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
350 ta = type(a)
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
351 tb = type(b)
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
352
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
353 if ta == int:
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
354 ta = float
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
355 if tb == int:
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
356 tb = float
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
357
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
358 return (ta == tb)
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
359
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
360 def update_params(p):
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
361 params = {}
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
362 for i in p:
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
363 params[i['name']] = i['value']
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
364
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
365 if params.viewkeys() != _FIELD_DEFAULTS.viewkeys():
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
366 diff = params.viewkeys() ^ _FIELD_DEFAULTS.viewkeys()
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
367 return "Key mismatch, difference %s" % str(diff)
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
368
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
369 for k, v in params.items():
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
370 if not same_type(v, _FIELD_DEFAULTS[k]):
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
371 return "Bad type for %s, %s vs %s" % (k , type(v), type(_FIELD_DEFAULTS[k]))
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
372
253
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 227
diff changeset
373 fridge_settings.update(params)
194
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
374 return True
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
375
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
376
4fa8cbf31065 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 191
diff changeset
377