templog: web/log.py comparison

- replace ssl client certs with cookies - remove unused ssh code - add /set?fake=1 test mode

comparison

equal deleted inserted replaced

-:35ae717d48f0
+:f7261dd970da
 'nowort': True,
 'fridge_range_lower': 3,
 'fridge_range_upper': 3,
 }
+def fake_params():
+""" for quicker testing """
+r = []
+r.append({'name': 'going', 'value': 'true', 'kind': 'yesno', 'title': 'going'})
+r.append({'name': 'temperature', 'value': 12.5, 'kind': 'number', 'title': 'temperature', 'digits': 1, 'amount': 0.1, 'unit': '°'})
+return r
 def get_params():
 """ Can return None if there aren't any parameters yet,
 otherwise returns the parameter list """
 r = []
 n['title'] = k
 r.append(n)
 return json.dumps(r, sort_keys=True, indent=4)
-def send_params(params):
-# 'templog_receive' is ignored due to authorized_keys
-# restrictions. the rpi has authorized_keys with
-# command="/home/matt/templog/venv/bin/python /home/matt/templog/py/receive.py",no-pty,no-port-forwarding,no-x11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC....
-args = [config.SSH_PROG, '-i', config.SSH_KEYFILE,
-config.SSH_HOST, 'templog_receive']
-try:
-p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-(out, err) = p.communicate(json.dumps(params))
-except OSError, e:
-print>>sys.stderr, e
-return "Failed update"
-if 'Good Update' in out:
-return True
-print>>sys.stderr, "Strange return from update:"
-print>>sys.stderr, out
-return "Unexpected update result"
 def same_type(a, b):
 ta = type(a)
 tb = type(b)
 if ta == int:

Mercurial > templog