From 8b3519c5f7540b99d19ed2c3163aabf9897dd5a4 Mon Sep 17 00:00:00 2001
From: Victor Vieux <victor.vieux@dotcloud.com>
Date: Wed, 17 Jul 2013 13:56:09 +0000
Subject: [PATCH] getEvents a bit simpler

---
 api.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/api.go b/api.go
index 0a7f5744b1..dd3e8eed0d 100644
--- a/api.go
+++ b/api.go
@@ -218,20 +218,21 @@ func getInfo(srv *Server, version float64, w http.ResponseWriter, r *http.Reques
 }
 
 func getEvents(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	sendEvent := func(wf *utils.WriteFlusher, event *utils.JSONMessage) (bool, error) {
+	sendEvent := func(wf *utils.WriteFlusher, event *utils.JSONMessage) (error) {
 		b, err := json.Marshal(event)
 		if err != nil {
-			return true, nil
+			return fmt.Errorf("JSON error")
 		}
 		_, err = wf.Write(b)
 		if err != nil {
+			// On error, evict the listener
 			utils.Debugf("%s", err)
 			srv.Lock()
 			delete(srv.listeners, r.RemoteAddr)
 			srv.Unlock()
-			return false, err
+			return err
 		}
-		return false, nil
+		return nil
 	}
 
 	if err := parseForm(r); err != nil {
@@ -248,10 +249,11 @@ func getEvents(srv *Server, version float64, w http.ResponseWriter, r *http.Requ
 	w.Header().Set("Content-Type", "application/json")
 	wf := utils.NewWriteFlusher(w)
 	if since != 0 {
+		// If since, send previous events that happened after the timestamp
 		for _, event := range srv.events {
 			if event.Time >= since {
-				skip, err := sendEvent(wf, &event)
-				if skip {
+				err := sendEvent(wf, &event)
+				if err != nil && err.Error() == "JSON error" {
 					continue
 				}
 				if err != nil {
@@ -262,8 +264,8 @@ func getEvents(srv *Server, version float64, w http.ResponseWriter, r *http.Requ
 	}
 	for {
 		event := <-listener
-		skip, err := sendEvent(wf, &event)
-		if skip {
+		err := sendEvent(wf, &event)
+		if err != nil && err.Error() == "JSON error" {
 			continue
 		}
 		if err != nil {