Mercurial > templog

annotate web/log.py @ 162:d73077e8cd67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add daemon mode with locking, add "disabled" parameter
author Matt Johnston <matt@ucc.asn.au>
date Fri, 11 Jan 2013 23:41:56 +0800
parents 683cfd134f6a
children 632d436d227b
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
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
18 from colorsys import hls_to_rgb
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
19
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
20 import config
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
22 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
23 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
24
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
25 # returns (path, sensor_name) tuples
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
26 def all_sensors():
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
27 return [(r, os.path.basename(r[:-4]))
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
28 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
29
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
30 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
31 # 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
32 # update with prior values straight away.
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
33 if 'voltage' in sensor_id:
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
34 args = [
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
35 '--step', '3600',
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
36 'DS:temp:GAUGE:7200:1:10',
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
37 'RRA:AVERAGE:0.5:1:87600']
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
38 elif 'fridge_on' in sensor_id:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
39 args = [
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
40 '--step', '300',
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
41 'DS:temp:GAUGE:600:-100:500',
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
42 'RRA:LAST:0.5:1:1051200']
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
43 else:
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
44 args = [
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
45 '--step', '300',
88
6f4497a448e8 increase temperature logging range
Matt Johnston <matt@ucc.asn.au>
parents: 78
diff changeset
46 'DS:temp:GAUGE:600:-100:500',
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
47 'RRA:AVERAGE:0.5:1:1051200']
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
48
159
683cfd134f6a Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
49 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
50
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
51 rrdtool.create(sensor_rrd_path(sensor_id),
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
52 '--start', 'now-60d',
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
53 *args)
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
54
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
55 # stolen from viewmtn, stolen from monotone-viz
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
56 def colour_from_string(str):
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
57 def f(off):
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
58 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
59 hashval = hashlib.sha1(str).digest()
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
60 hue = f(5)
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
61 li = f(1) * 0.15 + 0.55
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
62 sat = f(2) * 0.5 + .5
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
63 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
64
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
65 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
66 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
67 os.environ['MATT_PNG_BODGE_FILTER'] = 'paeth'
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
68 rrds = all_sensors()
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 graph_args = []
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
71 have_volts = False
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
72 for n, (rrdfile, sensor) in enumerate(rrds):
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
73 unit = None
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
74 if 'avrtemp' in sensor:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
75 continue
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
76 if 'voltage' in sensor:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
77 have_volts = True
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
78 vname = 'scalevolts'
71
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
79 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
80 unit = 'V'
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
81 elif 'fridge_on' in sensor:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
82 vname = 'fridge_on'
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
83 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
84 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
85 else:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
86 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
87 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
88 # limit max temp to 50
fd8482365489 limit temps to 35º on graph
Matt Johnston <matt@ucc.asn.au>
parents: 99
diff changeset
89 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
90 unit = '<span face="Liberation Serif">º</span>C'
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
91
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
92 format_last_value = None
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
93 if unit:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
94 try:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
95 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
96 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
97 except ValueError:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
98 pass
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
99 width = config.LINE_WIDTH
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
100 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
101 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
102 if format_last_value:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
103 print_legend = '%s (%s)' % (legend, format_last_value)
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
104 else:
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
105 print_legend = legend
78
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
106 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
107
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
108 end = int(start+length)
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
109 start = int(start)
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
110
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
111 tempf = tempfile.NamedTemporaryFile()
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
112 dateformat = '%H:%M:%S %Y-%m-%d'
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
113 watermark = ("Now %s\t"
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
114 "Start %s\t"
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
115 "End %s" % (
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
116 datetime.datetime.now().strftime(dateformat),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
117 datetime.datetime.fromtimestamp(start).strftime(dateformat),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
118 datetime.datetime.fromtimestamp(end).strftime(dateformat) ))
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
119
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
120 args = [tempf.name, '-s', str(start),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
121 '-e', str(end),
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
122 '-w', str(config.GRAPH_WIDTH),
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
123 '-h', str(config.GRAPH_HEIGHT),
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
124 '--slope-mode',
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
125 '--border', '0',
73
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
126 # '--vertical-label', 'Voltage',
71
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
127 '--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
128 '--dynamic-labels',
56
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
129 '--grid-dash', '1:0',
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
130 '--zoom', str(config.ZOOM),
56
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
131 '--color', 'GRID#00000000',
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
132 '--color', 'MGRID#aaaaaa',
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
133 '--color', 'BACK#ffffff',
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
134 '--disable-rrdtool-tag',
78
c7b6da1adb47 ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
135 '--pango-markup',
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
136 '--watermark', watermark,
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
137 '--imgformat', 'PNG'] \
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
138 + graph_args
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
139 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT]
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
140 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT]
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
141 if have_volts:
71
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
142 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
143 '--right-axis-format', '%.0lf',
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
144 # '--right-axis-label', 'Temperature'
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
145 ]
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
146
104
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
147 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
148 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
149 #return tempf
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
150 return tempf.read()
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
151
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
152 def validate_value(m):
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
153 if m == 85:
159
683cfd134f6a Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
154 return 'U'
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
155 else:
159
683cfd134f6a Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
156 return '%f' % m
125
397ac5c079bf avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 104
diff changeset
157
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
158 def sensor_update(sensor_id, measurements):
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
159 try:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
160 open(sensor_rrd_path(sensor_id))
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
161 except IOError, e:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
162 create_rrd(sensor_id)
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
163
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
164 if measurements:
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
165 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
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
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
183 def record_debug(params):
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'))
159
683cfd134f6a Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
186 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
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 def tail_debug_log():
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
191 f = debug_file()
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
192 f.seek(0, 2)
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
193 size = f.tell()
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
194 f.seek(max(0, size-30000))
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 101
diff changeset
195 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
196
75
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
197 def convert_ds18b20_12bit(reading):
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
198 value = struct.unpack('>h', binascii.unhexlify(reading))[0]
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
199 return value * 0.0625
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
200
94
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
201 def time_rem(name, entries):
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
202 val_ticks = int(entries[name])
95
fd9cfa6829fd fix rem calculation
Matt Johnston <matt@ucc.asn.au>
parents: 94
diff changeset
203 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
204 tick_wake = int(entries['tick_wake']) + 1
94
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
205 tick_secs = int(entries['tick_secs'])
229b740a607f use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 88
diff changeset
206 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
207
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
208 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
209
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
210 start_time = time.time()
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
211
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
212 debugf = record_debug(params)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
213
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
214 remote_now = params['now']
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
215
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
216 time_diff = start_time - remote_now
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
217
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
218 # readings is [ ({sensorname: value, ...}, time), ... ]
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
219 readings = params['readings']
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
220
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
221 # measurements is {sensorname: [(time, value), ...], ...}
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
222 measurements = {}
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
223 for rs, t in readings:
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
224 real_t = t + time_diff
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
225 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
226 measurements.setdefault(s, []).append((real_t, v))
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
227
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
228 # one-off measurements here
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
229 measurements['fridge_on'] = [ (time.time(), params['fridge_on']) ]
159
683cfd134f6a Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
230 measurements['fridge_setpoint'] = [ (time.time(), params['fridge_setpoint']) ]
126
6a9419ac8f77 ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 125
diff changeset
231
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
232 for s, vs in measurements.iteritems():
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 137
diff changeset
233 sensor_update(s, vs)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
234
104
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
235 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
236 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
237 debugf.flush()