annotate web/log.py @ 392:1a5f2449f760

fix dump.py's sock.send()
author Matt Johnston <matt@ucc.asn.au>
date Wed, 11 Jul 2012 23:43:36 +0800
parents abe8c530812e
children 6f4497a448e8
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
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
17 from colorsys import hls_to_rgb
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
18
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
19 import config
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
20
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21 def sensor_rrd_path(s):
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
22 return '%s/sensor_%s.rrd' % (config.DATA_PATH, s)
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
24 # returns (path, sensor_name) tuples
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
25 def all_sensors():
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
26 return [(r, os.path.basename(r[:-4]))
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
27 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
28
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
29 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
30 # 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
31 # update with prior values straight away.
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
32 if 'voltage' in sensor_id:
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
33 args = [
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
34 '--step', '3600',
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
35 'DS:temp:GAUGE:7200:1:10',
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
36 'RRA:AVERAGE:0.5:1:87600']
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
37 else:
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
38 args = [
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
39 '--step', '300',
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
40 'DS:temp:GAUGE:600:-10:100',
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
41 'RRA:AVERAGE:0.5:1:1051200']
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
42
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
43 rrdtool.create(sensor_rrd_path(sensor_id),
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
44 '--start', 'now-60d',
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
45 *args)
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
46
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
47 # stolen from viewmtn, stolen from monotone-viz
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
48 def colour_from_string(str):
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
49 def f(off):
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
50 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
51 hashval = hashlib.sha1(str).digest()
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
52 hue = f(5)
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
53 li = f(1) * 0.15 + 0.55
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
54 sat = f(2) * 0.5 + .5
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
55 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
56
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
57 def graph_png(start, length):
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
58 rrds = all_sensors()
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
59
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
60 graph_args = []
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
61 have_volts = False
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
62 for n, (rrdfile, sensor) in enumerate(rrds):
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
63 if 'avrtemp' in sensor:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
64 continue
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
65 if 'voltage' in sensor:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
66 have_volts = True
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
67 vname = 'scalevolts'
377
55710361804b swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
68 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
69 unit = 'V'
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
70 else:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
71 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
72 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals())
55710361804b swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
73 graph_args.append('CDEF:%(vname)s=raw%(vname)s,0.1,*,2,+' % locals())
384
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
74 unit = '<span face="Liberation Serif">ยบ</span>C'
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
75
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
76 last_value = float(rrdtool.info(rrdfile)['ds[temp].last_ds'])
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
77 width = config.LINE_WIDTH
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
78 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
79 colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor))
384
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
80 format_last_value = ('%f' % last_value).rstrip('0') + unit
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
81 print_legend = '%s (%s)' % (legend, format_last_value)
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
82 graph_args.append('LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals())
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
83
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
84 end = int(start+length)
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
85 start = int(start)
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
86
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
87 tempf = tempfile.NamedTemporaryFile()
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
88 dateformat = '%H:%M:%S %Y-%m-%d'
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
89 watermark = ("Now %s\t"
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
90 "Start %s\t"
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
91 "End %s" % (
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
92 datetime.datetime.now().strftime(dateformat),
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
93 datetime.datetime.fromtimestamp(start).strftime(dateformat),
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
94 datetime.datetime.fromtimestamp(end).strftime(dateformat) ))
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
95
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
96 args = [tempf.name, '-s', str(start),
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
97 '-e', str(end),
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
98 '-w', str(config.GRAPH_WIDTH),
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
99 '-h', str(config.GRAPH_HEIGHT),
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
100 '--slope-mode',
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
101 '--border', '0',
379
fed6738be1ab Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 377
diff changeset
102 # '--vertical-label', 'Voltage',
377
55710361804b swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
103 '--y-grid', '0.1:1',
55710361804b swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
104 '--dynamic-labels',
362
8fea6144951b improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 355
diff changeset
105 '--grid-dash', '1:0',
383
a032051475fe ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 381
diff changeset
106 '--zoom', str(config.ZOOM),
362
8fea6144951b improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 355
diff changeset
107 '--color', 'GRID#00000000',
8fea6144951b improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 355
diff changeset
108 '--color', 'MGRID#aaaaaa',
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
109 '--color', 'BACK#ffffff',
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
110 '--disable-rrdtool-tag',
384
abe8c530812e ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
111 '--pango-markup',
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
112 '--watermark', watermark,
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
113 '--imgformat', 'PNG'] \
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
114 + graph_args
373
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
115 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT]
1f530c97c053 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 369
diff changeset
116 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT]
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
117 if have_volts:
377
55710361804b swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
118 args += ['--right-axis', '10:-20', # matches the scalevolts CDEF above
379
fed6738be1ab Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 377
diff changeset
119 '--right-axis-format', '%.0lf',
fed6738be1ab Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 377
diff changeset
120 # '--right-axis-label', 'Temperature'
fed6738be1ab Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 377
diff changeset
121 ]
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
122
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
123 rrdtool.graph(*args)
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
124 return tempf.read()
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
125
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
126 def sensor_update(sensor_id, measurements, first_real_time, time_step):
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
127 try:
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
128 open(sensor_rrd_path(sensor_id))
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
129 except IOError, e:
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
130 create_rrd(sensor_id)
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
131
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
132 if measurements:
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
133 values = ['%d:%f' % p for p in
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
134 zip((first_real_time + time_step*t for t in xrange(len(measurements))),
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
135 measurements)]
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
136
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
137 rrdfile = sensor_rrd_path(sensor_id)
346
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
138 # 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
139 for v in values:
a1aa4176ca2c update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 351
diff changeset
140 try:
a1aa4176ca2c update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 351
diff changeset
141 rrdtool.update(rrdfile, v)
369
dc9d63e2fd7a UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
142 except rrdtool.error, e:
355
a1aa4176ca2c update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 351
diff changeset
143 print>>sys.stderr, "Bad rrdtool update '%s'" % v
a1aa4176ca2c update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 351
diff changeset
144 traceback.print_exc(file=sys.stderr)
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
145
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
146 # be paranoid
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
147 f = file(rrdfile)
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
148 os.fsync(f.fileno())
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
149
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
150 def record_debug(lines):
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
151 f = open('%s/debug.log' % config.DATA_PATH, 'a+')
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
152 f.write('===== %s =====\n' % time.strftime('%a, %d %b %Y %H:%M:%S'))
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
153 f.writelines(('%s\n' % s for s in lines))
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
154 f.flush()
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
155 return f
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
156
381
83c83014e5e3 report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 379
diff changeset
157 def convert_ds18b20_12bit(reading):
83c83014e5e3 report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 379
diff changeset
158 value = struct.unpack('>h', binascii.unhexlify(reading))[0]
83c83014e5e3 report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 379
diff changeset
159 return value * 0.0625
83c83014e5e3 report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 379
diff changeset
160
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
161 def parse(lines):
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
162
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
163 debugf = record_debug(lines)
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
164
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
165 entries = dict(l.split('=', 1) for l in lines)
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
166 if len(entries) != len(lines):
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
167 raise Exception("Keys are not unique")
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
168
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
169 num_sensors = int(entries['sensors'])
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
170 num_measurements = int(entries['measurements'])
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
171
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
172 sensors = [entries['sensor_id%d' % n] for n in xrange(num_sensors)]
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
173
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
174 meas = []
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
175 for s in sensors:
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
176 meas.append([])
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
177
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
178 for n in xrange(num_measurements):
383
a032051475fe ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 381
diff changeset
179 vals = [convert_ds18b20_12bit(x) for x in entries["meas%d" % n].strip().split()]
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
180 if len(vals) != num_sensors:
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
181 raise Exception("Wrong number of sensors for measurement %d" % n)
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
182 # we make an array of values for each sensor
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
183 for s in xrange(num_sensors):
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
184 meas[s].append(vals[s])
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
185
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
186 avr_now = float(entries['now'])
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
187 avr_first_time = float(entries['first_time'])
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
188 time_step = float(entries['time_step'])
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
189
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
190 if 'avrtemp' in entries:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
191 avrtemp = val_scale(int(entries['avrtemp']))
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
192 sensor_update('avrtemp', [avrtemp], time.time(), 1)
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
193
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
194 if 'voltage' in entries:
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
195 voltage = 0.001 * int(entries['voltage'])
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
196 sensor_update('voltage', [voltage], time.time(), 1)
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
197
346
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
198 #sqlite
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
199 # - time
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
200 # - voltage
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
201 # - boot time
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
202
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
203 first_real_time = time.time() - (avr_now - avr_first_time)
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
204
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
205 for sensor_id, measurements in zip(sensors, meas):
346
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
206 # XXX sqlite add
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
207 sensor_update(sensor_id, measurements, first_real_time, time_step)
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
208
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
209 debugf.write("Updated %d sensors\n" % len(sensors))
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
210 debugf.flush()