From cd14933a047eecc5b0fc2174b62162c56beaedec Mon Sep 17 00:00:00 2001
From: Sebastian Steuer <iggy@yggi.de>
Date: Sat, 7 Dec 2013 00:01:05 +0100
Subject: [PATCH] less print(), more logging

---
 oven.py        |  2 +-
 picoreflowd.py | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/oven.py b/oven.py
index 0989e5c..5a883c6 100644
--- a/oven.py
+++ b/oven.py
@@ -221,7 +221,7 @@ class TempSensorSimulate(TempSensor):
 
             #temperature change of oven by cooling to env
             t -= p_env *self.time_step / c_oven
-            print "-> %dW heater: %.0f -> %dW oven: %.0f -> %dW env"%(int(p_heat * self.oven.heat),t_h,int(p_ho),t,int(p_env))
+            log.debug("energy sim: -> %dW heater: %.0f -> %dW oven: %.0f -> %dW env"%(int(p_heat * self.oven.heat),t_h,int(p_ho),t,int(p_env)))
             self.temperature = t
 
             time.sleep(self.sleep_time)
diff --git a/picoreflowd.py b/picoreflowd.py
index c1672c8..1927520 100644
--- a/picoreflowd.py
+++ b/picoreflowd.py
@@ -34,8 +34,6 @@ def send_static(filename):
 def get_websocket_from_request():
     env = bottle.request.environ;
     wsock = env.get('wsgi.websocket')
-    print wsock.path
-    print wsock.origin
     if not wsock:
         abort(400, 'Expected WebSocket request.')
     return wsock
@@ -84,7 +82,7 @@ def handle_storage():
             message = wsock.receive()
             if not message:
                 break
-            print message
+            log.debug("websocket (storage) received: %s"%message)
             
             try:
                 msgdict = json.loads(message)
@@ -104,7 +102,8 @@ def handle_storage():
                         msgdict["resp"]="OK"
                     else:
                         msgdict["resp"]="FAIL"
-                    print "sending:" +str(msgdict)
+                    log.debug("websocket (storage) sent: %s"%message)
+
                     wsock.send(json.dumps(msgdict))
                     wsock.send(get_profiles())
         except WebSocketError:
@@ -143,13 +142,12 @@ def save_profile(profile, force=False):
     filename = profile['name']+".json"
     filepath = os.path.join(profile_path,filename)
     if not force and os.path.exists(filepath):
-        print "Didnt write"
+        log.error("Could not write, %s already exists"%filepath)
         return False
     with open(filepath, 'w+') as f:
-        print filepath
         f.write(profile_json)
         f.close()
-    print "Did write"
+    log.info("Wrote %s"%filepath)
     return True
 
 def main():