# HG changeset patch # User Matt Johnston # Date 1448891117 -28800 # Node ID 788d713f6b87df0b152d5b454d41fea4fc8ab68c # Parent d3ebdb1d6a55454384f5d8415aff87d4515c1674# Parent 6c14e0573f50252c5d9a338dc9f1e9a345d64b63 merge diff -r d3ebdb1d6a55 -r 788d713f6b87 web/log.py --- a/web/log.py Mon Nov 30 21:40:57 2015 +0800 +++ b/web/log.py Mon Nov 30 21:45:17 2015 +0800 @@ -51,8 +51,6 @@ 'DS:temp:GAUGE:600:-100:500', 'RRA:AVERAGE:0.5:1:1051200'] - print>>sys.stderr, sensor_rrd_path(sensor_id) - rrdtool.create(sensor_rrd_path(sensor_id), '--start', 'now-60d', *args) @@ -143,8 +141,7 @@ sensor_lines.sort(key = lambda (legend, line): "Wort" in legend) graph_args += (line for (legend, line) in sensor_lines) - print>>sys.stderr, '\n'.join(graph_args) - + #print>>sys.stderr, '\n'.join(graph_args) end = int(start+length) start = int(start) @@ -289,11 +286,12 @@ debugf.write("Updated sensors in %.2f secs\n" % timedelta) debugf.flush() +# types used here define the type of a field _FIELD_DEFAULTS = { 'fridge_setpoint': 16.0, 'fridge_difference': 0.2, 'overshoot_delay': 720, # 12 minutes - 'overshoot_factor': 1, # ºC + 'overshoot_factor': 1.0, # ºC 'disabled': False, 'nowort': True, 'fridge_range_lower': 3, @@ -301,10 +299,14 @@ } def get_params(): + """ Can return None if there aren't any parameters yet, + otherwise returns the parameter list """ r = [] vals = read_current_params() + if not vals: + return None for k, v in _FIELD_DEFAULTS.iteritems(): n = {'name': k, 'value': type(v)(vals[k])} diff -r d3ebdb1d6a55 -r 788d713f6b87 web/templog.py --- a/web/templog.py Mon Nov 30 21:40:57 2015 +0800 +++ b/web/templog.py Mon Nov 30 21:45:17 2015 +0800 @@ -94,8 +94,13 @@ def set(): allowed = ["false", "true"][secure.check_user_hash(config.ALLOWED_USERS)] response.set_header('Cache-Control', 'no-cache') + inline_data = log.get_params() + if not inline_data: + response.status = 503 # Service Unavailable + return bottle.template('noparamsyet') + return bottle.template('set', - inline_data = log.get_params(), + inline_data = inline_data, csrf_blob = secure.get_csrf_blob(), allowed = allowed) diff -r d3ebdb1d6a55 -r 788d713f6b87 web/views/noparamsyet.tpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/noparamsyet.tpl Mon Nov 30 21:45:17 2015 +0800 @@ -0,0 +1,21 @@ + + + +Try again soon + + + + +

+The templog fridge client hasn't sent its current settings to the server yet. +

+

+Try again in a minute or two. +

+ + diff -r d3ebdb1d6a55 -r 788d713f6b87 web/views/top.tpl --- a/web/views/top.tpl Mon Nov 30 21:40:57 2015 +0800 +++ b/web/views/top.tpl Mon Nov 30 21:45:17 2015 +0800 @@ -3,7 +3,7 @@ Wort Temperature Log -