changeset 910:8329c3eddb08

use goweb response api Ignore-this: 48fa536486bbe388dd4c48620e601e7c darcs-hash:20130901033222-312f9-0b215977e26a2b53543252447c41f81564181dc9
author drewp <drewp@bigasterisk.com>
date Sat, 31 Aug 2013 20:32:22 -0700
parents c80a23d86ea9
children 80ba4e4d02fc
files service/laundry/laundry.go
diffstat 1 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/service/laundry/laundry.go	Sat Aug 31 16:09:48 2013 -0700
+++ b/service/laundry/laundry.go	Sat Aug 31 20:32:22 2013 -0700
@@ -119,14 +119,12 @@
 		} else if string(body) == "off" {
 			level = 0
 		} else {
-			http.Error(c.HttpResponseWriter(), "body must be 'on' or 'off'", http.StatusBadRequest)
-			return nil
+			return goweb.Respond.With(c, http.StatusBadRequest, "body must be 'on' or 'off'")
 		}
 
 		hwio.DigitalWrite(pins.OutLed, level)
 		pins.LastOutLed = level
-		http.Error(c.HttpResponseWriter(), "", http.StatusAccepted)
-		return nil
+		return goweb.Respond.WithStatusText(c, http.StatusAccepted)
 	})
 
 	setStrike := func (level int) {
@@ -142,13 +140,11 @@
 
 		level, err2 := strconv.Atoi(string(body[:]))
 		if err2 != nil {
-			http.Error(c.HttpResponseWriter(), "body must be '0' or '1'", http.StatusBadRequest)
-			return nil
+			return goweb.Respond.With(c, http.StatusBadRequest, "body must be '0' or '1'")
 		}
 
 		setStrike(level)
-		http.Error(c.HttpResponseWriter(), "", http.StatusAccepted)
-		return nil
+		return goweb.Respond.WithStatusText(c, http.StatusAccepted)
 	})
 	
 	goweb.Map("PUT", "/strike/temporaryUnlock", func(c context.Context) error {
@@ -170,14 +166,12 @@
 			time.Sleep(time.Duration(req.Seconds * float64(time.Second)))
 			setStrike(0)
 		}()
-		http.Error(c.HttpResponseWriter(), "", http.StatusAccepted)
-		return nil
+		return goweb.Respond.WithStatusText(c, http.StatusAccepted)
 	})
 
 	goweb.Map("PUT", "/speaker/beep", func(c context.Context) error {
 		// queue a beep
-		http.Error(c.HttpResponseWriter(), "", http.StatusAccepted)
-		return nil
+		return goweb.Respond.WithStatusText(c, http.StatusAccepted)
 	})