Mercurial > templog

annotate web/log.py @ 480:6d464ac4ba3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
prototype
author Matt Johnston <matt@ucc.asn.au>
date Mon, 03 Feb 2014 00:08:59 +0800
parents fc8ddea46987
children e731c0d30b09
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
384
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
1 # -*- coding: utf-8 -*-
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
2 #:vim:et:ts=4:sts=4:sw=4:
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
3 import rrdtool
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
4 import os
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
5 import os.path
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
6 import sys
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
7 import glob
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
8 import hashlib
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
9 import tempfile
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
10 import time
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
11 import syslog
349
e7f070855a22 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
12 import sqlite3
355
a1aa4176ca2c update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 351
diff changeset
13 import traceback
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
14 import datetime
381
83c83014e5e3 report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 379
diff changeset
15 import struct
383
a032051475fe ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 381
diff changeset
16 import binascii
458
94932e7051e5 Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
17 import json
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
18 from colorsys import hls_to_rgb
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
19
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
20 import config
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
22 def sensor_rrd_path(s):
458
94932e7051e5 Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
23 return '%s/sensor_%s.rrd' % (config.DATA_PATH, str(s))
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
24
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
25 # returns (path, sensor_name) tuples
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
26 def all_sensors():
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
27 return [(r, os.path.basename(r[:-4]))
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
28 for r in glob.glob('%s/*.rrd' % config.DATA_PATH)]
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
29
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
30 def create_rrd(sensor_id):
350
03322c38b4a9 Create with a start date so that it works
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
31 # start date of 10 seconds into 1970 is used so that we can
03322c38b4a9 Create with a start date so that it works
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
32 # update with prior values straight away.
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
33 if 'voltage' in sensor_id:
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
34 args = [
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
35 '--step', '3600',
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
36 'DS:temp:GAUGE:7200:1:10',
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
37 'RRA:AVERAGE:0.5:1:87600']
425
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
38 elif 'fridge_on' in sensor_id:
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
39 args = [
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
40 '--step', '300',
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
41 'DS:temp:GAUGE:600:-100:500',
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
42 'RRA:LAST:0.5:1:1051200']
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
43 else:
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
44 args = [
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
45 '--step', '300',
394
2cd246ea92c6 increase temperature logging range
Matt Johnston <matt@ucc.asn.au>
parents: 384
diff changeset
46 'DS:temp:GAUGE:600:-100:500',
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
47 'RRA:AVERAGE:0.5:1:1051200']
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
48
458
94932e7051e5 Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
49 print>>sys.stderr, sensor_rrd_path(sensor_id)
94932e7051e5 Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
50
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
51 rrdtool.create(sensor_rrd_path(sensor_id),
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
52 '--start', 'now-60d',
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
53 *args)
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
54
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
55 # stolen from viewmtn, stolen from monotone-viz
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
56 def colour_from_string(str):
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
57 def f(off):
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
58 return ord(hashval[off]) / 256.0
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
59 hashval = hashlib.sha1(str).digest()
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
60 hue = f(5)
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
61 li = f(1) * 0.15 + 0.55
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
62 sat = f(2) * 0.5 + .5
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
63 return ''.join(["%.2x" % int(x * 256) for x in hls_to_rgb(hue, li, sat)])
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
64
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
65 def graph_png(start, length):
410
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
66 os.environ['MATT_PNG_BODGE_COMPRESS'] = '4'
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
67 os.environ['MATT_PNG_BODGE_FILTER'] = 'paeth'
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
68 rrds = all_sensors()
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
69
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
70 graph_args = []
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
71 have_volts = False
464
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
72
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
73 ## volts = temp * volts_div + volts_shift
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
74 #volts_div = 10
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
75 #volts_shift = 2
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
76 volts_div = 1
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
77 volts_shift = 0
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
78
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
79 volts_mult = 1.0/volts_div
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
80
478
fc8ddea46987 sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 464
diff changeset
81 # (title, sensorline) pairs.
fc8ddea46987 sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 464
diff changeset
82 sensor_lines = []
fc8ddea46987 sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 464
diff changeset
83
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
84 for n, (rrdfile, sensor) in enumerate(rrds):
425
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
85 unit = None
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
86 if 'avrtemp' in sensor:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
87 continue
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
88 if 'voltage' in sensor:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
89 have_volts = True
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
90 vname = 'scalevolts'
377
55710361804b swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
91 graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals())
384
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
92 unit = 'V'
425
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
93 elif 'fridge_on' in sensor:
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
94 vname = 'fridge_on'
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
95 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:LAST' % locals())
431
ae12b30352f0 extra logging
Matt Johnston <matt@ucc.asn.au>
parents: 425
diff changeset
96 graph_args.append('CDEF:%(vname)s=raw%(vname)s,-0.2,*,3,+' % locals())
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
97 else:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
98 vname = 'temp%d' % n
377
55710361804b swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
99 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals())
407
36a33c56c383 limit temps to 35º on graph
Matt Johnston <matt@ucc.asn.au>
parents: 405
diff changeset
100 # limit max temp to 50
464
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
101 graph_args.append('CDEF:%(vname)s=raw%(vname)s,38,GT,UNKN,raw%(vname)s,%(volts_mult)f,*,%(volts_shift)f,+,IF' % locals())
384
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
102 unit = '<span face="Liberation Serif">º</span>C'
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
103
425
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
104 format_last_value = None
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
105 if unit:
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
106 try:
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
107 last_value = float(rrdtool.info(rrdfile)['ds[temp].last_ds'])
436
8841a709ae78 strip multiple-of-ten temperatures correctly
Matt Johnston <matt@ucc.asn.au>
parents: 431
diff changeset
108 format_last_value = ('%f' % last_value).rstrip('0').rstrip('.') + unit
425
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
109 except ValueError:
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
110 pass
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
111 width = config.LINE_WIDTH
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
112 legend = config.SENSOR_NAMES.get(sensor, sensor)
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
113 colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor))
425
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
114 if format_last_value:
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
115 print_legend = '%s (%s)' % (legend, format_last_value)
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
116 else:
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
117 print_legend = legend
478
fc8ddea46987 sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 464
diff changeset
118 sensor_lines.append( (legend, 'LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals()) )
fc8ddea46987 sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 464
diff changeset
119
fc8ddea46987 sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 464
diff changeset
120 sensor_lines.sort(key = lambda (legend, line): "Wort" in legend)
fc8ddea46987 sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 464
diff changeset
121
fc8ddea46987 sort sensor lines
Matt Johnston <matt@ucc.asn.au>
parents: 464
diff changeset
122 graph_args += (line for (legend, line) in sensor_lines)
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
123
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
124 end = int(start+length)
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
125 start = int(start)
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
126
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
127 tempf = tempfile.NamedTemporaryFile()
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
128 dateformat = '%H:%M:%S %Y-%m-%d'
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
129 watermark = ("Now %s\t"
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
130 "Start %s\t"
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
131 "End %s" % (
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
132 datetime.datetime.now().strftime(dateformat),
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
133 datetime.datetime.fromtimestamp(start).strftime(dateformat),
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
134 datetime.datetime.fromtimestamp(end).strftime(dateformat) ))
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
135
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
136 args = [tempf.name, '-s', str(start),
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
137 '-e', str(end),
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
138 '-w', str(config.GRAPH_WIDTH),
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
139 '-h', str(config.GRAPH_HEIGHT),
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
140 '--slope-mode',
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
141 '--border', '0',
379
fed6738be1ab Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 377
diff changeset
142 # '--vertical-label', 'Voltage',
464
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
143 '--y-grid', '%(volts_mult)f:1' % locals(),
377
55710361804b swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
144 '--dynamic-labels',
362
8fea6144951b improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 355
diff changeset
145 '--grid-dash', '1:0',
383
a032051475fe ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 381
diff changeset
146 '--zoom', str(config.ZOOM),
362
8fea6144951b improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 355
diff changeset
147 '--color', 'GRID#00000000',
8fea6144951b improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 355
diff changeset
148 '--color', 'MGRID#aaaaaa',
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
149 '--color', 'BACK#ffffff',
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
150 '--disable-rrdtool-tag',
384
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
151 '--pango-markup',
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
152 '--watermark', watermark,
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
153 '--imgformat', 'PNG'] \
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
154 + graph_args
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
155 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT]
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
156 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT]
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
157 if have_volts:
464
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
158 volts_shift_div = volts_div * volts_shift
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
159 args += ['--right-axis', '%(volts_div)f:-%(volts_shift_div)f' % locals(),
c3926e7cfb0c LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents: 458
diff changeset
160 # '--right-axis-format', '%.0lf',
379
fed6738be1ab Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 377
diff changeset
161 # '--right-axis-label', 'Temperature'
fed6738be1ab Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 377
diff changeset
162 ]
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
163
410
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
164 print>>sys.stderr, ' '.join("'%s'" % s for s in args)
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
165 rrdtool.graph(*args)
410
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
166 #return tempf
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
167 return tempf.read()
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
168
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
169 def validate_value(m):
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
170 if m == 85:
458
94932e7051e5 Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
171 return 'U'
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
172 else:
458
94932e7051e5 Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
173 return '%f' % m
424
96bec5482294 avoid bad values
Matt Johnston <matt@ucc.asn.au>
parents: 410
diff changeset
174
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
175 def sensor_update(sensor_id, measurements):
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
176 try:
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
177 open(sensor_rrd_path(sensor_id))
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
178 except IOError, e:
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
179 create_rrd(sensor_id)
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
180
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
181 if measurements:
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
182 values = ['%d:%s' % (t, validate_value(m)) for (t, m) in measurements]
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
183
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
184 rrdfile = sensor_rrd_path(sensor_id)
346
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
185 # XXX what to do here when it fails...
355
a1aa4176ca2c update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 351
diff changeset
186 for v in values:
a1aa4176ca2c update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 351
diff changeset
187 try:
a1aa4176ca2c update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 351
diff changeset
188 rrdtool.update(rrdfile, v)
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
189 except rrdtool.error, e:
410
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
190 print>>sys.stderr, "Bad rrdtool update '%s': %s" % (v, str(e))
355
a1aa4176ca2c update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 351
diff changeset
191 traceback.print_exc(file=sys.stderr)
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
192
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
193 # be paranoid
410
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
194 #f = file(rrdfile)
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
195 #os.fsync(f.fileno())
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
196
409
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
197 def debug_file(mode='r'):
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
198 return open('%s/debug.log' % config.DATA_PATH, mode)
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
199
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
200 def record_debug(params):
409
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
201 f = debug_file('a+')
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
202 f.write('===== %s =====\n' % time.strftime('%a, %d %b %Y %H:%M:%S'))
458
94932e7051e5 Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
203 json.dump(params, f, sort_keys=True, indent=4)
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
204 f.flush()
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
205 return f
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
206
409
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
207 def tail_debug_log():
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
208 f = debug_file()
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
209 f.seek(0, 2)
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
210 size = f.tell()
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
211 f.seek(max(0, size-30000))
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
212 return '\n'.join(l.strip() for l in f.readlines()[-400:])
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 407
diff changeset
213
381
83c83014e5e3 report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 379
diff changeset
214 def convert_ds18b20_12bit(reading):
83c83014e5e3 report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 379
diff changeset
215 value = struct.unpack('>h', binascii.unhexlify(reading))[0]
83c83014e5e3 report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 379
diff changeset
216 return value * 0.0625
83c83014e5e3 report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 379
diff changeset
217
400
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
218 def time_rem(name, entries):
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
219 val_ticks = int(entries[name])
401
56c32a62b0cd fix rem calculation
Matt Johnston <matt@ucc.asn.au>
parents: 400
diff changeset
220 val_rem = int(entries['%s_rem' % name])
405
d9b78a1bdd1d fix off-by-one in remainder code
Matt Johnston <matt@ucc.asn.au>
parents: 401
diff changeset
221 tick_wake = int(entries['tick_wake']) + 1
400
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
222 tick_secs = int(entries['tick_secs'])
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
223 return val_ticks + float(val_rem) * tick_secs / tick_wake
1137f315209b use the remainder of times
Matt Johnston <matt@ucc.asn.au>
parents: 394
diff changeset
224
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
225 def parse(params):
410
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
226
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
227 start_time = time.time()
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
228
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
229 debugf = record_debug(params)
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
230
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
231 remote_now = params['now']
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
232
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
233 time_diff = start_time - remote_now
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
234
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
235 # readings is [ ({sensorname: value, ...}, time), ... ]
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
236 readings = params['readings']
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
237
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
238 # measurements is {sensorname: [(time, value), ...], ...}
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
239 measurements = {}
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
240 for rs, t in readings:
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
241 real_t = t + time_diff
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
242 for s, v in rs.iteritems():
458
94932e7051e5 Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
243 measurements.setdefault(s, []).append((real_t, v))
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
244
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
245 # one-off measurements here
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
246 measurements['fridge_on'] = [ (time.time(), params['fridge_on']) ]
458
94932e7051e5 Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
247 measurements['fridge_setpoint'] = [ (time.time(), params['fridge_setpoint']) ]
425
eb685e1afcbb ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents: 424
diff changeset
248
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
249 for s, vs in measurements.iteritems():
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 436
diff changeset
250 sensor_update(s, vs)
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
251
410
910324f14fe4 - few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
252 timedelta = time.time() - start_time
458
94932e7051e5 Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
253 debugf.write("Updated sensors in %.2f secs\n" % timedelta)
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
254 debugf.flush()