# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1433773984 -28800
# Node ID 6d06795aefbb93356d530264101c96ea28f21a59
# Parent  8ef52f27cf95e124bdf06cd79fae9c4d9bb4b3a1# Parent  ffe25107d5201ee491ae1a96216fb7d688e853e1
merge

diff -r 8ef52f27cf95 -r 6d06795aefbb py/fridge.py
--- a/py/fridge.py	Mon Jun 08 22:32:34 2015 +0800
+++ b/py/fridge.py	Mon Jun 08 22:33:04 2015 +0800
@@ -35,8 +35,8 @@
         if self.server.params.disabled:
             L("Fridge is disabled")
         while True:
-            self.do()
             try:
+                self.do()
                 yield from self.server.sleep(config.FRIDGE_SLEEP)
             except Exception as e:
                 EX("fridge failed")
@@ -111,7 +111,7 @@
         else:
             # fridge is off
             turn_on = False
-            D("fridge %(fridge)f max %(fridge_max)f wort %(wort)f wort_max %(wort_max)f" % locals())
+            D("fridge %(fridge)s max %(fridge_max)s wort %(wort)s wort_max %(wort_max)s" % locals())
             if not params.nowort \
                 and wort is not None \
                 and wort >= wort_max:
diff -r 8ef52f27cf95 -r 6d06795aefbb py/uploader.py
--- a/py/uploader.py	Mon Jun 08 22:32:34 2015 +0800
+++ b/py/uploader.py	Mon Jun 08 22:33:04 2015 +0800
@@ -59,8 +59,8 @@
 
     @asyncio.coroutine
     def do(self):
-        readings = self.server.take_readings()
         try:
+            readings = self.server.take_readings()
             tosend = self.get_tosend(readings)
             nreadings = len(readings)
             yield from self.send(tosend)