annotate web/log.py @ 143:0895f5ad7731

copied fridge logic from main.c
author Matt Johnston <matt@ucc.asn.au>
date Tue, 20 Nov 2012 22:03:10 +0800
parents d36fe81077cc
children 3b4277aaed3c
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
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
17 from colorsys import hls_to_rgb
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
18
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
19 import config
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
20
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21 def sensor_rrd_path(s):
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
22 return '%s/sensor_%s.rrd' % (config.DATA_PATH, s)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
24 # returns (path, sensor_name) tuples
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
25 def all_sensors():
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
26 return [(r, os.path.basename(r[:-4]))
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
27 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
28
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
29 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
30 # 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
31 # update with prior values straight away.
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
32 if 'voltage' in sensor_id:
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
33 args = [
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
34 '--step', '3600',
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
35 'DS:temp:GAUGE:7200:1:10',
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
36 'RRA:AVERAGE:0.5:1:87600']
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
37 elif 'fridge_on' in sensor_id:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
38 args = [
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
39 '--step', '300',
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
40 'DS:temp:GAUGE:600:-100:500',
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
41 'RRA:LAST:0.5:1:1051200']
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
42 else:
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
43 args = [
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
44 '--step', '300',
88
6f4497a448e8 increase temperature logging range
Matt Johnston <matt@ucc.asn.au>
parents: 78
diff changeset
45 'DS:temp:GAUGE:600:-100:500',
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
46 'RRA:AVERAGE:0.5:1:1051200']
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
47
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
48 rrdtool.create(sensor_rrd_path(sensor_id),
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
49 '--start', 'now-60d',
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
50 *args)
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
51
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
52 # stolen from viewmtn, stolen from monotone-viz
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
53 def colour_from_string(str):
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
54 def f(off):
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
55 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
56 hashval = hashlib.sha1(str).digest()
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
57 hue = f(5)
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
58 li = f(1) * 0.15 + 0.55
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
59 sat = f(2) * 0.5 + .5
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
60 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
61
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
62 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
63 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
64 os.environ['MATT_PNG_BODGE_FILTER'] = 'paeth'
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
65 rrds = all_sensors()
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
66
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
67 graph_args = []
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
68 have_volts = False
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
69 for n, (rrdfile, sensor) in enumerate(rrds):
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
70 unit = None
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
71 if 'avrtemp' in sensor:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
72 continue
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
73 if 'voltage' in sensor:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
74 have_volts = True
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
75 vname = 'scalevolts'
71
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
76 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
77 unit = 'V'
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
78 elif 'fridge_on' in sensor:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
79 vname = 'fridge_on'
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
80 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
81 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
82 else:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
83 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
84 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
85 # limit max temp to 50
fd8482365489 limit temps to 35º on graph
Matt Johnston <matt@ucc.asn.au>
parents: 99
diff changeset
86 graph_args.append('CDEF:%(vname)s=raw%(vname)s,35,GT,UNKN,raw%(vname)s,0.1,*,2,+,IF' % locals())
78
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
87 unit = '<span face="Liberation Serif">º</span>C'
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
88
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
89 format_last_value = None
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
90 if unit:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
91 try:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
92 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
93 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
94 except ValueError:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
95 pass
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
96 width = config.LINE_WIDTH
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
97 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
98 colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor))
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
99 if format_last_value:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
100 print_legend = '%s (%s)' % (legend, format_last_value)
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
101 else:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
102 print_legend = legend
78
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
103 graph_args.append('LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals())
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
104
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
105 end = int(start+length)
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
106 start = int(start)
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
107
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
108 tempf = tempfile.NamedTemporaryFile()
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
109 dateformat = '%H:%M:%S %Y-%m-%d'
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
110 watermark = ("Now %s\t"
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
111 "Start %s\t"
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
112 "End %s" % (
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
113 datetime.datetime.now().strftime(dateformat),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
114 datetime.datetime.fromtimestamp(start).strftime(dateformat),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
115 datetime.datetime.fromtimestamp(end).strftime(dateformat) ))
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
116
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
117 args = [tempf.name, '-s', str(start),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
118 '-e', str(end),
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
119 '-w', str(config.GRAPH_WIDTH),
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
120 '-h', str(config.GRAPH_HEIGHT),
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
121 '--slope-mode',
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
122 '--border', '0',
73
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
123 # '--vertical-label', 'Voltage',
71
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
124 '--y-grid', '0.1:1',
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
125 '--dynamic-labels',
56
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
126 '--grid-dash', '1:0',
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
127 '--zoom', str(config.ZOOM),
56
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
128 '--color', 'GRID#00000000',
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
129 '--color', 'MGRID#aaaaaa',
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
130 '--color', 'BACK#ffffff',
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
131 '--disable-rrdtool-tag',
78
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
132 '--pango-markup',
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
133 '--watermark', watermark,
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
134 '--imgformat', 'PNG'] \
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
135 + graph_args
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
136 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT]
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
137 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT]
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
138 if have_volts:
71
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
139 args += ['--right-axis', '10:-20', # matches the scalevolts CDEF above
73
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
140 '--right-axis-format', '%.0lf',
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
141 # '--right-axis-label', 'Temperature'
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
142 ]
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
143
104
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
144 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
145 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
146 #return tempf
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
147 return tempf.read()
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
148
125
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
149 def validate_values(measurements):
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
150 for m in measurements:
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
151 if m == 85:
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
152 yield 'U'
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
153 else:
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
154 yield '%f' % m
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
155
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
156 def sensor_update(sensor_id, measurements, first_real_time, time_step):
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
157 try:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
158 open(sensor_rrd_path(sensor_id))
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
159 except IOError, e:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
160 create_rrd(sensor_id)
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
161
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
162 if measurements:
125
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
163 values = ['%d:%s' % p for p in
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
164 zip((first_real_time + time_step*t for t in xrange(len(measurements))),
125
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
165 validate_values(measurements))]
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
166
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
167 rrdfile = sensor_rrd_path(sensor_id)
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
168 # 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
169 for v in values:
206294a354a7 update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 45
diff changeset
170 try:
206294a354a7 update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 45
diff changeset
171 rrdtool.update(rrdfile, v)
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
172 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
173 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
174 traceback.print_exc(file=sys.stderr)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
175
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
176 # be paranoid
104
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
177 #f = file(rrdfile)
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
178 #os.fsync(f.fileno())
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
179
103
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
180 def debug_file(mode='r'):
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
181 return open('%s/debug.log' % config.DATA_PATH, mode)
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
182
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
183 def record_debug(lines):
103
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
184 f = debug_file('a+')
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
185 f.write('===== %s =====\n' % time.strftime('%a, %d %b %Y %H:%M:%S'))
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
186 f.writelines(('%s\n' % s for s in lines))
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
187 f.flush()
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
188 return f
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
189
103
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
190
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
191 def tail_debug_log():
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
192 f = debug_file()
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
193 f.seek(0, 2)
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
194 size = f.tell()
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
195 f.seek(max(0, size-30000))
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
196 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
197
75
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
198 def convert_ds18b20_12bit(reading):
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
199 value = struct.unpack('>h', binascii.unhexlify(reading))[0]
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
200 return value * 0.0625
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
201
94
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
202 def time_rem(name, entries):
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
203 val_ticks = int(entries[name])
95
fd9cfa6829fd fix rem calculation
Matt Johnston <matt@ucc.asn.au>
parents: 94
diff changeset
204 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
205 tick_wake = int(entries['tick_wake']) + 1
94
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
206 tick_secs = int(entries['tick_secs'])
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
207 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
208
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
209 def parse(lines):
104
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
210
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
211 start_time = time.time()
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
212
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
213 debugf = record_debug(lines)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
214
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
215 entries = dict(l.split('=', 1) for l in lines)
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
216 if len(entries) != len(lines):
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
217 raise Exception("Keys are not unique")
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
218
131
719d5669ab27 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 126
diff changeset
219 if 'sensors' not in entries:
719d5669ab27 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 126
diff changeset
220 # only debug info, it's been recorded
719d5669ab27 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 126
diff changeset
221 return
719d5669ab27 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 126
diff changeset
222
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
223 num_sensors = int(entries['sensors'])
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
224 num_measurements = int(entries['measurements'])
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
225
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
226 sensors = [entries['sensor_id%d' % n] for n in xrange(num_sensors)]
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
227
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
228 meas = []
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
229 for s in sensors:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
230 meas.append([])
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
231
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
232 for n in xrange(num_measurements):
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
233 vals = [convert_ds18b20_12bit(x) for x in entries["meas%d" % n].strip().split()]
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
234 if len(vals) != num_sensors:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
235 raise Exception("Wrong number of sensors for measurement %d" % n)
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
236 # we make an array of values for each sensor
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
237 for s in xrange(num_sensors):
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
238 meas[s].append(vals[s])
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
239
94
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
240 avr_now = time_rem('now', entries)
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
241 avr_first_time = time_rem('first_time', entries)
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
242 avr_comms_time = time_rem('comms_time', entries)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
243 time_step = float(entries['time_step'])
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
244
94
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
245 debugf.write('now %f, comms_time %f, first_time %f, delta %f\n' %
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
246 (avr_now, avr_comms_time, avr_first_time, avr_now - avr_comms_time))
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
247
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
248 if 'avrtemp' in entries:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
249 avrtemp = val_scale(int(entries['avrtemp']))
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
250 sensor_update('avrtemp', [avrtemp], time.time(), 1)
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
251
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
252 if 'voltage' in entries:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
253 voltage = 0.001 * int(entries['voltage'])
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
254 sensor_update('voltage', [voltage], time.time(), 1)
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
255
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
256 if 'fridge_status' in entries:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
257 fridge_on = int(entries['fridge_status'])
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
258 sensor_update('fridge_on', [fridge_on], time.time(), 1)
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
259
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
260 if 'fridge' in entries:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
261 fridge_setpoint = float(entries['fridge'])
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
262 sensor_update('fridge_setpoint', [fridge_setpoint], time.time(), 1)
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
263 #sqlite
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
264 # - time
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
265 # - voltage
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
266 # - boot time
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
267
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
268 first_real_time = time.time() - (avr_now - avr_first_time)
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
269
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
270 for sensor_id, measurements in zip(sensors, meas):
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
271 # XXX sqlite add
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
272 sensor_update(sensor_id, measurements, first_real_time, time_step)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
273
104
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
274 timedelta = time.time() - start_time
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
275 debugf.write("Updated %d sensors in %.2f secs\n" % (len(sensors), timedelta))
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
276 debugf.flush()